[llvm-commits] [llvm-gcc-4.2] r41910 - /llvm-gcc-4.2/trunk/gcc/config/darwin.h

[Evan Cheng]

Author: evancheng
Date: Wed Sep 12 20:46:36 2007
New Revision: 41910

URL: http://llvm.org/viewvc/llvm-project?rev=41910&view=rev
Log:
Merge -r41908:41909 svn/llvm-project/llvm-gcc-4.0/trunk

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.h

Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.h?rev=41910&r1=41909&r2=41910&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Wed Sep 12 20:46:36 2007
@@ -1257,13 +1257,13 @@
      darwin_objc_llvm_implicit_target_global_var_section(decl) : 0)
 const char *darwin_objc_llvm_implicit_target_global_var_section(tree);
 
+/* Darwin X86-64 only supports PIC code generation. */
 #if defined (TARGET_386)
 #define LLVM_SET_TARGET_OPTIONS(argvec)              \
-  if (!TARGET_64BIT)                                 \
-    if (flag_pic)                                    \
-      argvec.push_back ("--relocation-model=pic");   \
-    else if (!MACHO_DYNAMIC_NO_PIC_P)                \
-      argvec.push_back ("--relocation-model=static")
+  if ((TARGET_64BIT) || flag_pic)                    \
+    argvec.push_back ("--relocation-model=pic");     \
+  else if (!MACHO_DYNAMIC_NO_PIC_P)                  \
+    argvec.push_back ("--relocation-model=static")
 #else /* defined (TARGET_386) */
 #define LLVM_SET_TARGET_OPTIONS(argvec)              \
   if (flag_pic)                                      \