58 lines
2.5 KiB
Diff
58 lines
2.5 KiB
Diff
|
diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp
|
||
|
|
--- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400
|
||
|
|
+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400
|
||
|
|
@@ -2077,16 +2077,6 @@
|
||
|
|
addPathIfExists(LibPath + "/../" + Multilib, Paths);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
|
||
|
|
- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
|
||
|
|
- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
|
||
|
|
- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
|
||
|
|
-
|
||
|
|
- // Try walking via the GCC triple path in case of multiarch GCC
|
||
|
|
- // installations with strange symlinks.
|
||
|
|
- if (GCCInstallation.isValid())
|
||
|
|
- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
|
||
|
|
- "/../../" + Multilib, Paths);
|
||
|
|
|
||
|
|
// Add the non-multilib suffixed paths (if potentially different).
|
||
|
|
if (GCCInstallation.isValid()) {
|
||
|
|
@@ -2100,8 +2090,6 @@
|
||
|
|
addPathIfExists(LibPath, Paths);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- addPathIfExists(SysRoot + "/lib", Paths);
|
||
|
|
- addPathIfExists(SysRoot + "/usr/lib", Paths);
|
||
|
|
}
|
||
|
|
|
||
|
|
bool Linux::HasNativeLLVMSupport() const {
|
||
|
|
diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp
|
||
|
|
--- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400
|
||
|
|
+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400
|
||
|
|
@@ -5210,24 +5210,6 @@
|
||
|
|
ToolChain.getArch() == llvm::Triple::thumb ||
|
||
|
|
(!Args.hasArg(options::OPT_static) &&
|
||
|
|
!Args.hasArg(options::OPT_shared))) {
|
||
|
|
- CmdArgs.push_back("-dynamic-linker");
|
||
|
|
- if (ToolChain.getArch() == llvm::Triple::x86)
|
||
|
|
- CmdArgs.push_back("/lib/ld-linux.so.2");
|
||
|
|
- else if (ToolChain.getArch() == llvm::Triple::arm ||
|
||
|
|
- ToolChain.getArch() == llvm::Triple::thumb)
|
||
|
|
- CmdArgs.push_back("/lib/ld-linux.so.3");
|
||
|
|
- else if (ToolChain.getArch() == llvm::Triple::mips ||
|
||
|
|
- ToolChain.getArch() == llvm::Triple::mipsel)
|
||
|
|
- CmdArgs.push_back("/lib/ld.so.1");
|
||
|
|
- else if (ToolChain.getArch() == llvm::Triple::mips64 ||
|
||
|
|
- ToolChain.getArch() == llvm::Triple::mips64el)
|
||
|
|
- CmdArgs.push_back("/lib64/ld.so.1");
|
||
|
|
- else if (ToolChain.getArch() == llvm::Triple::ppc)
|
||
|
|
- CmdArgs.push_back("/lib/ld.so.1");
|
||
|
|
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
|
||
|
|
- CmdArgs.push_back("/lib64/ld64.so.1");
|
||
|
|
- else
|
||
|
|
- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
|
||
|
|
}
|
||
|
|
|
||
|
|
CmdArgs.push_back("-o");
|