diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 3194d1d4ccfa078b79db3a90cb1b7b8167c2a6fb..eaa74590a656413440443830cef5e17e55a1a09b 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-06  Andrew Haley  <aph@redhat.com>
+
+        * src/alpha/osf.S (__FRAME_BEGIN__): Conditionalize for ELF.
+
 2001-06-03  Andrew Haley  <aph@redhat.com>
 
         * src/alpha/osf.S: Add unwind info.
diff --git a/libffi/src/alpha/osf.S b/libffi/src/alpha/osf.S
index 5605669194c68917258fd28e371bb78a325f974e..d6b839d871e5368dac4bd15ddee2e4639ce7ebba 100644
--- a/libffi/src/alpha/osf.S
+++ b/libffi/src/alpha/osf.S
@@ -3,6 +3,8 @@
    
    Alpha/OSF Foreign Function Interface 
 
+   $Id: osf.S,v 1.1.1.1 1998/11/29 16:48:16 green Exp $
+
    Permission is hereby granted, free of charge, to any person obtaining
    a copy of this software and associated documentation files (the
    ``Software''), to deal in the Software without restriction, including
@@ -285,6 +287,7 @@ $load_table:
 #error "osf.S out of sync with ffi.h"
 #endif
 
+#ifdef __ELF__
 	.section	.eh_frame,"aw",@progbits
 __FRAME_BEGIN__:
 	.4byte	$LECIE1-$LSCIE1	 # Length of Common Information Entry
@@ -344,3 +347,4 @@ $LASFDE3:
 	.byte	0x12	 # uleb128 0x12
 	.align 3
 $LEFDE3:
+#endif