[llvm-branch-commits] [llvm-gcc-branch] r110483 - in /llvm-gcc-4.2/branches/Apple/Pertwee: ./ gcc/ChangeLog.apple gcc/config/arm/arm.c

[Jim Grosbach]

Author: grosbach
Date: Fri Aug  6 17:30:07 2010
New Revision: 110483

URL: http://llvm.org/viewvc/llvm-project?rev=110483&view=rev
Log:
Merge 110479.


Modified:
    llvm-gcc-4.2/branches/Apple/Pertwee/   (props changed)
    llvm-gcc-4.2/branches/Apple/Pertwee/gcc/ChangeLog.apple
    llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.c

Propchange: llvm-gcc-4.2/branches/Apple/Pertwee/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug  6 17:30:07 2010
@@ -1 +1 @@
-/llvm-gcc-4.2/trunk:110043,110250,110459
+/llvm-gcc-4.2/trunk:110043,110250,110459,110479

Modified: llvm-gcc-4.2/branches/Apple/Pertwee/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Pertwee/gcc/ChangeLog.apple?rev=110483&r1=110482&r2=110483&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Pertwee/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/branches/Apple/Pertwee/gcc/ChangeLog.apple Fri Aug  6 17:30:07 2010
@@ -1,3 +1,23 @@
+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
+	* config/rs6000/ppc_intrinsics.h: Moved again from here to...
+	* ginclude/ppc_intrinsics.h: ...here.
+	* 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
+	* config/rs6000/ppc_intrinsics.h: Moved here from top-level more-hdrs.
+	* config.gcc: Add ppc_intrinsics.h to extra_headers.
+	* timevar.c: Update path to ppc_intrinsics.h.
+
 2010-06-28 Jim Grosbach <grosbach at apple.com>
 
 	Radar 7449793

Modified: llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.c?rev=110483&r1=110482&r2=110483&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4.2/branches/Apple/Pertwee/gcc/config/arm/arm.c Fri Aug  6 17:30:07 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 */