[llvm-commits] [llvm-gcc-4.2] r67329 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h

[Bill Wendling]

Author: void
Date: Thu Mar 19 14:54:26 2009
New Revision: 67329

URL: http://llvm.org/viewvc/llvm-project?rev=67329&view=rev
Log:
Because of header file ordering, arm.h might define MACHO_DYNAMIC_NO_PIC_P before config/darwin.h. Let config/darwin.h trump arm.h.

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h?rev=67329&r1=67328&r2=67329&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h Thu Mar 19 14:54:26 2009
@@ -1166,8 +1166,11 @@
 
 /* Macros defining the various PIC cases.  */
 
-/* APPLE LOCAL mdynamic-no-pic */
+/* APPLE LOCAL begin mdynamic-no-pic */
+/* LLVM LOCAL - possibly redefine MACHO_DYNAMIC_NO_PIC_P */
+#undef MACHO_DYNAMIC_NO_PIC_P
 #define MACHO_DYNAMIC_NO_PIC_P	(TARGET_MACHO_DYNAMIC_NO_PIC)
+/* APPLE LOCAL end mdynamic-no-pic */
 /* APPLE LOCAL begin mach-o cleanup */
 #undef MACHOPIC_INDIRECT
 #define MACHOPIC_INDIRECT	(flag_pic || MACHO_DYNAMIC_NO_PIC_P)