From 504e86877dcdcfd4d789038e0281232741a89fcf Mon Sep 17 00:00:00 2001 From: Renato Golin Date: Mon, 27 Jul 2015 18:29:53 +0000 Subject: [PATCH] Merging r243262: 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_37@243299 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 6 ++++-- test/Driver/linux-ld.c | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 4eee4f75b0..0871ce446e 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -7865,13 +7865,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"; diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c index 5e865a953c..a976b388d3 100644 --- a/test/Driver/linux-ld.c +++ b/test/Driver/linux-ld.c @@ -618,6 +618,13 @@ // CHECK-ARM: "-dynamic-linker" "{{.*}}/lib/ld-linux.so.3" // // RUN: %clang %s -### -o %t.o 2>&1 \ +// RUN: --target=arm-linux-gnueabi -mfloat-abi=hard \ +// RUN: | FileCheck --check-prefix=CHECK-ARM-ABIHF %s +// CHECK-ARM-ABIHF: "{{.*}}ld{{(.exe)?}}" +// CHECK-ARM-ABIHF: "-m" "armelf_linux_eabi" +// CHECK-ARM-ABIHF: "-dynamic-linker" "{{.*}}/lib/ld-linux-armhf.so.3" +// +// RUN: %clang %s -### -o %t.o 2>&1 \ // RUN: --target=arm-linux-gnueabihf \ // RUN: | FileCheck --check-prefix=CHECK-ARM-HF %s // CHECK-ARM-HF: "{{.*}}ld{{(.exe)?}}" -- 2.50.1