[llvm-commits] [llvm-gcc-4.2] r67322 - /llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h

[Bill Wendling]

Author: void
Date: Thu Mar 19 13:56:38 2009
New Revision: 67322

URL: http://llvm.org/viewvc/llvm-project?rev=67322&view=rev
Log:
--- Merging (from foreign repository) r67317 into '.':
U    gcc/config/arm/arm.h

Don't redefine MACHO_DYNAMIC_NO_PIC_P.

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

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

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h Thu Mar 19 13:56:38 2009
@@ -30,9 +30,12 @@
 /* Overridden by arm/darwin.h, whether it is included first or not. */
 #ifndef TARGET_MACHO
 #define TARGET_MACHO 0
-/* LLVM LOCAL */
+/* LLVM LOCAL begin */
+#ifndef MACHO_DYNAMIC_NO_PIC_P
 #define MACHO_DYNAMIC_NO_PIC_P 0
 #endif
+/* LLVM LOCAL end */
+#endif
 /* APPLE LOCAL end ARM darwin target */
 
 /* APPLE LOCAL ARM interworking */