summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVasileios Kalintiris <Vasileios.Kalintiris@imgtec.com>2016-05-13 12:13:13 +0000
committerVasileios Kalintiris <Vasileios.Kalintiris@imgtec.com>2016-05-13 12:13:13 +0000
commitb3f9f5f96316394ea84b18da4dfbd5f422ca96fc (patch)
tree823c6edb265d5662eae1f3cba20a70bbfbde1a15
parente91e52671a8768e35d998ee1c482842713edd074 (diff)
downloadbcm5719-llvm-b3f9f5f96316394ea84b18da4dfbd5f422ca96fc.tar.gz
bcm5719-llvm-b3f9f5f96316394ea84b18da4dfbd5f422ca96fc.zip
[mips] Consult triple's vendor field before using musl's interpreter.
This should affect only the mips-mti-linux toolchain. llvm-svn: 269411
-rw-r--r--clang/lib/Driver/Tools.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 5da1fd6c969..6ce850be4ee 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/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";
OpenPOWER on IntegriCloud