diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 010e8f10a..a0d6e2df2 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-26  Paul Brook  <paul@codesourcery.com>
+                                                                                
+        * libc/sys/arm/crt0.S (_start): Add .cantunwind annotation.
+                                                                                
 2004-10-28  Nick Clifton  <nickc@redhat.com>
 
 	* configure.in: Add support for iq2000 target.
diff --git a/libgloss/arm/crt0.S b/libgloss/arm/crt0.S
index 7f36b12fc..b5633368d 100644
--- a/libgloss/arm/crt0.S
+++ b/libgloss/arm/crt0.S
@@ -21,6 +21,10 @@
 start:
 _start:
 _mainCRTStartup:
+#if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
+	/* Annotation for EABI unwinding tables.  */
+	.fnstart
+#endif
 
 /* Start by setting up a stack */
 #ifdef ARM_RDP_MONITOR
@@ -328,6 +332,11 @@ change_back:
 	.weak FUNCTION (software_init_hook)
 #endif
 	
+#endif
+#if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__)
+	/* Protect against unhandled exceptions.  */
+	.cantunwind
+	.fnend
 #endif
 .LC1:
 	.word	__bss_start__