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

[Bill Wendling]

Author: void
Date: Fri Feb 26 17:56:42 2010
New Revision: 97287

URL: http://llvm.org/viewvc/llvm-project?rev=97287&view=rev
Log:
If -fno-PIE or -fno-pie is specified on the command line, then pass -no_pie to
the linker. Also add passing -pie to the linker if -fPIE is specified.

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=97287&r1=97286&r2=97287&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Fri Feb 26 17:56:42 2010
@@ -398,8 +398,7 @@
      %{Zbundle:-bundle} \
      %{Zbundle_loader*:-bundle_loader %*} \
      %{client_name*} \
-     %{compatibility_version*:%e-compatibility_version only allowed with -dynamiclib\
-} \
+     %{compatibility_version*:%e-compatibility_version only allowed with -dynamiclib} \
      %{current_version*:%e-current_version only allowed with -dynamiclib} \
      %{Zforce_flat_namespace:-force_flat_namespace} \
      %{Zinstall_name*:%e-install_name only allowed with -dynamiclib} \
@@ -450,6 +449,11 @@
    %{Zmultiplydefinedunused*:-multiply_defined_unused %*} \
    "/* APPLE LOCAL mainline 2007-06-01 5238485 */" \
    %{fpie:-pie} \
+   "/* LLVM LOCAL begin <rdar://problem/7651045> */" \
+   %{fPIE:-pie} \
+   %{fno-pie:-no_pie} \
+   %{fno-PIE:-no_pie} \
+   "/* LLVM LOCAL end <rdar://problem/7651045> */" \
    %{prebind} %{noprebind} %{nofixprebinding} %{prebind_all_twolevel_modules} \
    %{read_only_relocs} \
    %{sectcreate*} %{sectorder*} %{seg1addr*} %{segprot*} \