diff options
| author | Renato Golin <renato.golin@linaro.org> | 2015-07-27 09:56:37 +0000 |
|---|---|---|
| committer | Renato Golin <renato.golin@linaro.org> | 2015-07-27 09:56:37 +0000 |
| commit | 24ba3e985211f2cee5280ea75f507b9df5b941b2 (patch) | |
| tree | 35f98b5549c3e72ef7a6c897b3b01d7317180fcf /clang/lib/Driver/Tools.cpp | |
| parent | 015ce0f68f791b3abec4225c1b2e532ce5020174 (diff) | |
| download | bcm5719-llvm-24ba3e985211f2cee5280ea75f507b9df5b941b2.tar.gz bcm5719-llvm-24ba3e985211f2cee5280ea75f507b9df5b941b2.zip | |
Setting ARM dynamic linker name from commandline
Currently trigger to select hard-float linker is only based of -gnueabihf
appearing in target triplet, but we should also select it when hardfloat
is requested via cmdline.
Patch by Khem Raj.
llvm-svn: 243262
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 0377bc561b4..dcf919b5dba 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -7887,13 +7887,15 @@ static std::string getLinuxDynamicLinker(const ArgList &Args, else if (Arch == llvm::Triple::aarch64_be) return "/lib/ld-linux-aarch64_be.so.1"; else if (Arch == llvm::Triple::arm || Arch == llvm::Triple::thumb) { - if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) + if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF || + tools::arm::getARMFloatABI(ToolChain.getDriver(), Args, ToolChain.getTriple()) == "hard") return "/lib/ld-linux-armhf.so.3"; else return "/lib/ld-linux.so.3"; } else if (Arch == llvm::Triple::armeb || Arch == llvm::Triple::thumbeb) { // TODO: check which dynamic linker name. - if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) + if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF || + tools::arm::getARMFloatABI(ToolChain.getDriver(), Args, ToolChain.getTriple()) == "hard") return "/lib/ld-linux-armhf.so.3"; else return "/lib/ld-linux.so.3"; |
