[llvm-commits] [llvm-gcc-4.2] r110932 - in /llvm-gcc-4.2/trunk/gcc/config/arm: arm.c arm.h

[Jim Grosbach]

Author: grosbach
Date: Thu Aug 12 11:26:16 2010
New Revision: 110932

URL: http://llvm.org/viewvc/llvm-project?rev=110932&view=rev
Log:
fix v6 defaults and v6m detection.

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

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=110932&r1=110931&r2=110932&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Thu Aug 12 11:26:16 2010
@@ -681,9 +681,6 @@
 /* Nonzero if this chip supports the ARM 6K extensions.  */
 int arm_arch6k = 0;
 
-/* Nonzero if this chip supports the ARM 6M extensions.  */
-int arm_arch6m = 0;
-
 /* APPLE LOCAL begin 6093388 -mfpu=neon default for v7a */
 /* Nonzero if this chip supports the ARM 7A extensions.  */
 int arm_arch7a = 0;
@@ -1474,8 +1471,7 @@
   /* v7m and v6m  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
-       || (insn_flags & FL_FOR_ARCH6M) == FL_FOR_ARCH6M)
+  if (((insn_flags & FL_FOR_ARCH7M) == FL_FOR_ARCH7M || arm_tune == cortexm0)
       && thumb_option < 0)
     thumb_option = 1;
   /* LLVM LOCAL end */
@@ -1586,8 +1582,6 @@
   arm_arch7a = (insn_flags & FL_FOR_ARCH7A) == FL_FOR_ARCH7A;
   /* APPLE LOCAL begin v7 support. Merge from mainline */
   arm_arch7m = (insn_flags & FL_FOR_ARCH7M) == FL_FOR_ARCH7M;
-  /* LLVM LOCAL processor support */
-  arm_arch6m = (insn_flags & FL_FOR_ARCH6M) == FL_FOR_ARCH6M;
   arm_arch_notm = (insn_flags & FL_NOTM) != 0;
   arm_arch_thumb2 = (insn_flags & FL_THUMB2) != 0;
   /* APPLE LOCAL end v7 support. Merge from mainline */

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.h?rev=110932&r1=110931&r2=110932&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.h Thu Aug 12 11:26:16 2010
@@ -3532,7 +3532,7 @@
          ? "thumbv7m"                                                      \
          : (arm_arch_thumb2                                                \
            ? "thumbv6t2"                                                   \
-           : (arm_arch6m                                                   \
+           : (arm_tune == cortexm0                                         \
               ? "thumbv6m"                                                 \
               : (arm_arch6                                                 \
                  ? "thumbv6"                                               \
@@ -3541,7 +3541,7 @@
                     : (arm_arch5                                           \
                        ? "thumbv5"                                         \
                        : (arm_arch4t                                       \
-                          ? "thumbv4t" : ""))))))))                         \
+                          ? "thumbv4t" : ""))))))))                        \
    : (arm_arch7a                                                           \
       ? "armv7"                                                            \
       : (arm_arch_thumb2                                                   \