diff options
| author | Roman Divacky <rdivacky@freebsd.org> | 2012-09-07 13:36:21 +0000 |
|---|---|---|
| committer | Roman Divacky <rdivacky@freebsd.org> | 2012-09-07 13:36:21 +0000 |
| commit | a3c502427750707a3641494b6fa8069b8f943d97 (patch) | |
| tree | 81ff540b5453e5ff64c6423263f05319004b6815 /clang/lib/Driver/Tools.cpp | |
| parent | cc0637c2b6bbf4820688b0c7e71a2e14ea229776 (diff) | |
| download | bcm5719-llvm-a3c502427750707a3641494b6fa8069b8f943d97.tar.gz bcm5719-llvm-a3c502427750707a3641494b6fa8069b8f943d97.zip | |
Link to crtend.S when PIE in the FreeBSD driver. Patch by Brooks Davis!
llvm-svn: 163388
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index d4a537240fe..1117202f939 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -5353,10 +5353,10 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA, if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nostartfiles)) { - if (!Args.hasArg(options::OPT_shared)) - CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtend.o"))); - else + if (Args.hasArg(options::OPT_shared) || Args.hasArg(options::OPT_pie)) CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtendS.o"))); + else + CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtend.o"))); CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o"))); } |
