[llvm-commits] [llvm-gcc-4.2] r46701 - /llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c

[Tanya Lattner]

Author: tbrethou
Date: Mon Feb  4 00:47:14 2008
New Revision: 46701

URL: http://llvm.org/viewvc/llvm-project?rev=46701&view=rev
Log:
Merge from mainline.
Fix my previous patch. It changed the behavior on TARGET_MACHO.

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

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=46701&r1=46700&r2=46701&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:47:14 2008
@@ -15167,9 +15167,11 @@
   /* Darwin/mach-o: use a stub for dynamic references.  */
 #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);
+          && ! 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