]> granicus.if.org Git - clang/commitdiff
[mips] Consult triple's vendor field before using musl's interpreter.
authorVasileios Kalintiris <Vasileios.Kalintiris@imgtec.com>
Fri, 13 May 2016 12:13:13 +0000 (12:13 +0000)
committerVasileios Kalintiris <Vasileios.Kalintiris@imgtec.com>
Fri, 13 May 2016 12:13:13 +0000 (12:13 +0000)
This should affect only the mips-mti-linux toolchain.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@269411 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/Tools.cpp

index 5da1fd6c969c7d9b80a851f8a9f79f12853c66a5..6ce850be4ee281de841d0978486f2ada9e9dc0ae 100644 (file)
@@ -8991,7 +8991,9 @@ static std::string getLinuxDynamicLinker(const ArgList &Args,
     bool IsNaN2008 = mips::isNaN2008(Args, ToolChain.getTriple());
     if (mips::isUCLibc(Args))
       LibName = IsNaN2008 ? "ld-uClibc-mipsn8.so.0" : "ld-uClibc.so.0";
-    else if (!ToolChain.getTriple().hasEnvironment()) {
+    else if (!ToolChain.getTriple().hasEnvironment() &&
+             ToolChain.getTriple().getVendor() ==
+                 llvm::Triple::VendorType::MipsTechnologies) {
       bool LE = (ToolChain.getTriple().getArch() == llvm::Triple::mipsel) ||
                 (ToolChain.getTriple().getArch() == llvm::Triple::mips64el);
       LibName = LE ? "ld-musl-mipsel.so.1" : "ld-musl-mips.so.1";