r253214 - [mips] Do not add arch name in the compiler-rt's components.

[Vasileios Kalintiris via cfe-commits]

Author: vkalintiris
Date: Mon Nov 16 09:41:30 2015
New Revision: 253214

URL: http://llvm.org/viewvc/llvm-project?rev=253214&view=rev
Log:
[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.

Modified:
    cfe/trunk/lib/Driver/ToolChains.cpp
    cfe/trunk/test/Driver/mips-mti-linux.c

Modified: cfe/trunk/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=253214&r1=253213&r2=253214&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains.cpp Mon Nov 16 09:41:30 2015
@@ -2517,8 +2517,7 @@ std::string MipsLLVMToolChain::getCompil
   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();
 }
 

Modified: cfe/trunk/test/Driver/mips-mti-linux.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mips-mti-linux.c?rev=253214&r1=253213&r2=253214&view=diff
==============================================================================
--- cfe/trunk/test/Driver/mips-mti-linux.c (original)
+++ cfe/trunk/test/Driver/mips-mti-linux.c Mon Nov 16 09:41:30 2015
@@ -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"