commit c5688628d89cdcffd9b901bebaa795e2ffddc11f
author Rafael Espindola <rafael.espindola@gmail.com> Mon Nov 08 14:48:47 2010 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Mon Nov 08 14:48:47 2010 +0000
tree 134a0f493a2c27e277d16703df22e18f6dea1095
parent a1c0efd38dd190f719d94e325d31aebadbef9b3f

Pass "-z relro" as two arguments. This works with both gnu ld and gold.
Patch by Frits van Bommel.

llvm-svn: 118406

clang/lib/Driver/ToolChains.cpp

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 57743e5..6a15666 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1360,8 +1360,10 @@
 
   LinuxDistro Distro = DetectLinuxDistro(Arch);
 
-  if (IsUbuntu(Distro))
-    ExtraOpts.push_back("-z relro");
+  if (IsUbuntu(Distro)) {
+    ExtraOpts.push_back("-z");
+    ExtraOpts.push_back("relro");
+  }
 
   if (Arch == llvm::Triple::arm)
     ExtraOpts.push_back("-X");