[llvm-commits] [llvm-gcc-4.2] r110479 - in /llvm-gcc-4.2/trunk/gcc: ChangeLog.apple config/arm/arm.c

[Jim Grosbach]

Author: grosbach
Date: Fri Aug  6 16:58:01 2010
New Revision: 110479

URL: http://llvm.org/viewvc/llvm-project?rev=110479&view=rev
Log:
ARM default to thumb mode when required

Modified:
    llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
    llvm-gcc-4.2/trunk/gcc/config/arm/arm.c

Modified: llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ChangeLog.apple?rev=110479&r1=110478&r2=110479&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/ChangeLog.apple Fri Aug  6 16:58:01 2010
@@ -1,3 +1,7 @@
+2010-08-06  Jim Grosbach <grosbach at apple.com>
+
+	* config/arm/arm.c(arm_override_options): v7m only has thumb mode.
+
 2010-08-04  Bob Wilson  <bob.wilson at apple.com>
 
         Radar 7982386
@@ -6,7 +10,7 @@
 	* timevar.c: Update path to ppc_intrinsics.h.
 	* Makefile.in (USER_H): Add ppc_intrinsics.h.
 	* config.gcc: Revert previous change for ppc_intrinsics.h.
-	
+
 2010-07-29  Bob Wilson  <bob.wilson at apple.com>
 
         Radar 7982386

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.c?rev=110479&r1=110478&r2=110479&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Fri Aug  6 16:58:01 2010
@@ -1448,6 +1448,14 @@
   else
     targetm.rtx_costs = all_cores[(int)arm_tune].rtx_costs;
 
+  /* LLVM LOCAL begin */
+  /* v7m processors don't have ARM mode, so default to thumb mode.
+     Explicitly only set for default so we can error if the user
+     sets -marm or -mno-thumb. */
+  if ((insn_flags & FL_FOR_ARCH7M) == FL_FOR_ARCH7M && thumb_option < 0)
+    thumb_option = 1;
+  /* LLVM LOCAL end */
+
   /* Make sure that the processor choice does not conflict with any of the
      other command line choices.  */
 /* APPLE LOCAL begin v7 support. Merge from mainline */