[llvm-commits] [llvm-gcc-4.2] r46700 - in /llvm-gcc-4.2/branches/release_22/gcc/config/arm: arm.c arm.h bpabi.h

[Tanya Lattner]

Author: tbrethou
Date: Mon Feb  4 00:46:23 2008
New Revision: 46700

URL: http://llvm.org/viewvc/llvm-project?rev=46700&view=rev
Log:
Merge from mainline.
Fix the build for arm-linux-gnueabi.

Modified:
    llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c
    llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.h
    llvm-gcc-4.2/branches/release_22/gcc/config/arm/bpabi.h

Modified: llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c?rev=46700&r1=46699&r2=46700&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c Mon Feb  4 00:46:23 2008
@@ -15165,13 +15165,14 @@
   const char *function_name;
 
   /* Darwin/mach-o: use a stub for dynamic references.  */
-  if (TARGET_MACHO
-      && (flag_pic || MACHO_DYNAMIC_NO_PIC_P)
+#if TARGET_MACHO
+      if ((flag_pic || MACHO_DYNAMIC_NO_PIC_P)
       && ! machopic_data_defined_p (function_rtx))
     function_name =
        machopic_indirection_name (function_rtx, true);
-  else
-    function_name = XSTR (function_rtx, 0);
+#else
+      function_name = XSTR (function_rtx, 0);
+#endif
   /* APPLE LOCAL ARM end 4745175 */
 
   if (mi_delta < 0)

Modified: llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.h?rev=46700&r1=46699&r2=46700&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.h Mon Feb  4 00:46:23 2008
@@ -31,6 +31,9 @@
 #ifndef TARGET_MACHO
 #define TARGET_MACHO 0
 #endif
+#ifndef MACHO_DYNAMIC_NO_PIC_P
+#define MACHO_DYNAMIC_NO_PIC_P 0
+#endif
 /* APPLE LOCAL end ARM darwin target */
 
 /* APPLE LOCAL ARM interworking */
@@ -1830,9 +1833,15 @@
 #define SHORT_CALL_FLAG_CHAR	'^'
 #define LONG_CALL_FLAG_CHAR	'#'
 
+#define ENCODED_SHORT_CALL_ATTR_P(SYMBOL_NAME) \
+  (*(SYMBOL_NAME) == SHORT_CALL_FLAG_CHAR)
+
 #define SYMBOL_SHORT_CALL_ATTR_P(SYMBOL) \
   (SYMBOL_REF_FLAGS (SYMBOL) & SYMBOL_SHORT_CALL)
 
+#define ENCODED_LONG_CALL_ATTR_P(SYMBOL_NAME)  \
+  (*(SYMBOL_NAME) == LONG_CALL_FLAG_CHAR)
+
 #define SYMBOL_LONG_CALL_ATTR_P(SYMBOL) \
   (SYMBOL_REF_FLAGS (SYMBOL) & SYMBOL_LONG_CALL)
 

Modified: llvm-gcc-4.2/branches/release_22/gcc/config/arm/bpabi.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_22/gcc/config/arm/bpabi.h?rev=46700&r1=46699&r2=46700&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/release_22/gcc/config/arm/bpabi.h (original)
+++ llvm-gcc-4.2/branches/release_22/gcc/config/arm/bpabi.h Mon Feb  4 00:46:23 2008
@@ -35,7 +35,9 @@
 
 /* EABI targets should enable interworking by default.  */
 #undef TARGET_DEFAULT
-#define TARGET_DEFAULT MASK_INTERWORK
+/* LLVM Local begin */
+#define TARGET_DEFAULT (0)
+/* LLVM Local end */
 
 /* The ARM BPABI functions return a boolean; they use no special
    calling convention.  */