From 43985f60e99f3a340ef88325268bf8a608b45115 Mon Sep 17 00:00:00 2001 From: Vasileios Kalintiris Date: Fri, 13 May 2016 12:13:13 +0000 Subject: [PATCH] [mips] Consult triple's vendor field before using musl's interpreter. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 5da1fd6c96..6ce850be4e 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -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"; -- 2.50.1