]> granicus.if.org Git - clang/commitdiff
Link in Scrt1.o instead of crt1.o when -pie is specified.
authorRoman Divacky <rdivacky@freebsd.org>
Mon, 10 Oct 2011 19:47:45 +0000 (19:47 +0000)
committerRoman Divacky <rdivacky@freebsd.org>
Mon, 10 Oct 2011 19:47:45 +0000 (19:47 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141573 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Tools.cpp

index 648da87c8e688f1fae1fe3d9fa1ba9323b0175c2..2b4b9f1791a18e86dba16a58c7a57dab85c57ef4 100644 (file)
@@ -3929,9 +3929,11 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA,
       if (Args.hasArg(options::OPT_pg))
         CmdArgs.push_back(Args.MakeArgString(
                                 getToolChain().GetFilePath("gcrt1.o")));
-      else
+      else {
+        const char *crt = Args.hasArg(options::OPT_pie) ? "Scrt1.o" : "crt1.o";
         CmdArgs.push_back(Args.MakeArgString(
-                                getToolChain().GetFilePath("crt1.o")));
+                                getToolChain().GetFilePath(crt)));
+      }
       CmdArgs.push_back(Args.MakeArgString(
                               getToolChain().GetFilePath("crti.o")));
       CmdArgs.push_back(Args.MakeArgString(