diff options
| author | Roman Divacky <rdivacky@freebsd.org> | 2011-10-10 19:47:45 +0000 |
|---|---|---|
| committer | Roman Divacky <rdivacky@freebsd.org> | 2011-10-10 19:47:45 +0000 |
| commit | 3403a3b28f9c3a9402bb957c385fa63a7212b082 (patch) | |
| tree | a03a945af1b3cd60ba3bde040272120ccbb364cb /clang/lib/Driver/Tools.cpp | |
| parent | d52dd324d638ab448b87c7460e3dae15312826d2 (diff) | |
| download | bcm5719-llvm-3403a3b28f9c3a9402bb957c385fa63a7212b082.tar.gz bcm5719-llvm-3403a3b28f9c3a9402bb957c385fa63a7212b082.zip | |
Link in Scrt1.o instead of crt1.o when -pie is specified.
llvm-svn: 141573
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 648da87c8e6..2b4b9f1791a 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -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( |
