From 06033c7fa2d575a9a68b377f5ce9324433c23806 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 21 May 2016 21:52:36 -0700 Subject: [PATCH 1/8] clang: driver: Use /lib for ldso on OE OE does not follow the default base_libdir that clang has, therefore adjust it for OE it wont be able to support multilib since in multilib case OE switches the base libdir for 64bit to /lib64 instead of /lib Signed-off-by: Khem Raj --- lib/Driver/ToolChains/Linux.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp index f8f3623918..e662b6b262 100644 --- a/lib/Driver/ToolChains/Linux.cpp +++ b/lib/Driver/ToolChains/Linux.cpp @@ -566,12 +566,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { Loader = "ld.so.1"; break; case llvm::Triple::ppc64: - LibDir = "lib64"; + LibDir = "lib"; Loader = (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1"; break; case llvm::Triple::ppc64le: - LibDir = "lib64"; + LibDir = "lib"; Loader = (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2"; break; @@ -593,7 +593,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { Loader = "ld-linux.so.2"; break; case llvm::Triple::sparcv9: - LibDir = "lib64"; + LibDir = "lib"; Loader = "ld-linux.so.2"; break; case llvm::Triple::systemz: @@ -607,7 +607,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { case llvm::Triple::x86_64: { bool X32 = Triple.getEnvironment() == llvm::Triple::GNUX32; - LibDir = X32 ? "libx32" : "lib64"; + LibDir = "lib"; Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2"; break; } -- 2.18.0