diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 0b69a75fb..10eb8f404 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-24  Paul Brook  <paul@codesourcery.com>
+
+	* arm/linux-crt0.c: Disable Arm stub for Thumb-2.
+
 2006-08-23  Kazunori Asayama  <asayama@sm.sony.co.jp>
 
 	* spu/Makefile.in: Add new object files.
diff --git a/libgloss/arm/linux-crt0.c b/libgloss/arm/linux-crt0.c
index 29f317fd7..1fe2499e4 100644
--- a/libgloss/arm/linux-crt0.c
+++ b/libgloss/arm/linux-crt0.c
@@ -11,7 +11,7 @@
 
 static int _main(int argc, char *argv[]) __attribute__((noreturn));
 
-#if __thumb__
+#if __thumb__ && !__thumb2__
 asm("\n"
 	".code 32\n"
 	".global _start\n"