From b0be65cb39c840929a386df6478f8a8e316d44ef Mon Sep 17 00:00:00 2001 From: Vasileios Kalintiris Date: Mon, 16 Nov 2015 15:41:30 +0000 Subject: [PATCH] [mips] Do not add arch name in the compiler-rt's components. Instead, use the constant "mips" since the libraries are already placed under the multilib's OS suffix. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@253214 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/ToolChains.cpp | 3 +-- test/Driver/mips-mti-linux.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 0380e419e6..d1ce3f4f1f 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -2517,8 +2517,7 @@ std::string MipsLLVMToolChain::getCompilerRT(const ArgList &Args, llvm::sys::path::append(Path, SelectedMultilib.osSuffix(), "lib" + LibSuffix, getOS()); llvm::sys::path::append(Path, Twine("libclang_rt." + Component + "-" + - getTriple().getArchName() + - (Shared ? ".so" : ".a"))); + "mips" + (Shared ? ".so" : ".a"))); return Path.str(); } diff --git a/test/Driver/mips-mti-linux.c b/test/Driver/mips-mti-linux.c index 1b01ce5084..1549dc5b42 100644 --- a/test/Driver/mips-mti-linux.c +++ b/test/Driver/mips-mti-linux.c @@ -37,6 +37,6 @@ // CHECK-LE-HF-32R2-SAME: "[[SYSROOT]]/mipsel-r2-hard-musl/usr/lib{{/|\\\\}}crt1.o" // CHECK-LE-HF-32R2-SAME: "[[SYSROOT]]/mipsel-r2-hard-musl/usr/lib{{/|\\\\}}crti.o" // CHECK-LE-HF-32R2-SAME: "-L[[SYSROOT]]/mipsel-r2-hard-musl/usr/lib" -// CHECK-LE-HF-32R2-SAME: "{{[^"]+}}/mipsel-r2-hard-musl{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-mipsel.a" +// CHECK-LE-HF-32R2-SAME: "{{[^"]+}}/mipsel-r2-hard-musl{{/|\\\\}}lib{{/|\\\\}}linux{{/|\\\\}}libclang_rt.builtins-mips.a" // CHECK-LE-HF-32R2-SAME: "-lc" // CHECK-LE-HF-32R2-SAME: "[[SYSROOT]]/mipsel-r2-hard-musl/usr/lib{{/|\\\\}}crtn.o" -- 2.50.1