[llvm-commits] [llvm-gcc-4.2] r97887 - in /llvm-gcc-4.2/trunk/gcc/config/arm: arm.h libunwind.S

[Anton Korobeynikov]

Author: asl
Date: Sat Mar  6 13:39:54 2010
New Revision: 97887

URL: http://llvm.org/viewvc/llvm-project?rev=97887&view=rev
Log:
Initial bits of ARMv4-only support.
Patch by John Tytgat!

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

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=97887&r1=97886&r2=97887&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.h Sat Mar  6 13:39:54 2010
@@ -3519,7 +3519,9 @@
                : (arm_arch5                                                \
                   ? "armv5"                                                \
                   : (arm_arch4t                                            \
-                     ? "armv4t" : "")))))))
+                     ? "armv4t"                                            \
+                     : (arm_arch4                                          \
+                        ? "armv4" : ""))))))))
 
 #define LLVM_SET_MACHINE_OPTIONS(argvec)               \
   if (TARGET_SOFT_FLOAT)                               \

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/libunwind.S
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/libunwind.S?rev=97887&r1=97886&r2=97887&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/libunwind.S (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/libunwind.S Sat Mar  6 13:39:54 2010
@@ -35,6 +35,20 @@
 	EQUIV SYM (\name), SYM (__\name)
 .endm
 
+/* LLVM LOCAL begin.  Merge r122658 from mainline.  */
+#if (__ARM_ARCH__ == 4)
+/* Some coprocessors require armv5.  We know this code will never be run on
+   other cpus.  Tell gas to allow armv5, but only mark the objects as armv4.
+ */
+.arch armv5t
+#ifdef __ARM_ARCH_4T__
+.object_arch armv4t
+#else
+.object_arch armv4
+#endif
+#endif
+/* LLVM LOCAL end.  Merge r122658 from mainline.  */
+
 /* r0 points to a 16-word block.  Upload these values to the actual core
    state.  */
 ARM_FUNC_START restore_core_regs