Author: vkalintiris
Date: Fri May 13 07:13:13 2016
New Revision: 269411
URL: http://llvm.org/viewvc/llvm-project?rev=269411&view=rev
Log:
[mips] Consult triple's vendor field before using musl's interpreter.
This should affect only the mips-mti-linux toolchain.
Modified:
cfe/trunk/lib/Driver/Tools.cpp
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=269411&r1=269410&r2=269411&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Fri May 13 07:13:13 2016
@@ -8991,7 +8991,9 @@ static std::string getLinuxDynamicLinker
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";
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
