summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch')
-rw-r--r--recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch b/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
new file mode 100644
index 0000000..9b92b69
--- /dev/null
+++ b/recipes-devtools/clang/clang/0002-clang-driver-Use-lib-for-ldso-on-OE.patch
@@ -0,0 +1,56 @@
1From 089b7e146cfc86fafe7c21e74238d638ae997df9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 May 2016 21:52:36 -0700
4Subject: [PATCH 02/18] clang: driver: Use /lib for ldso on OE
5
6OE does not follow the default base_libdir
7that clang has, therefore adjust it for OE
8it wont be able to support multilib since
9in multilib case OE switches the base libdir
10for 64bit to /lib64 instead of /lib
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 clang/lib/Driver/ToolChains/Linux.cpp | 8 ++++----
15 1 file changed, 4 insertions(+), 4 deletions(-)
16
17diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
18index 5b757b8028c..552d329e7b8 100644
19--- a/clang/lib/Driver/ToolChains/Linux.cpp
20+++ b/clang/lib/Driver/ToolChains/Linux.cpp
21@@ -590,12 +590,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
22 Loader = "ld.so.1";
23 break;
24 case llvm::Triple::ppc64:
25- LibDir = "lib64";
26+ LibDir = "lib";
27 Loader =
28 (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
29 break;
30 case llvm::Triple::ppc64le:
31- LibDir = "lib64";
32+ LibDir = "lib";
33 Loader =
34 (tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
35 break;
36@@ -617,7 +617,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
37 Loader = "ld-linux.so.2";
38 break;
39 case llvm::Triple::sparcv9:
40- LibDir = "lib64";
41+ LibDir = "lib";
42 Loader = "ld-linux.so.2";
43 break;
44 case llvm::Triple::systemz:
45@@ -631,7 +631,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
46 case llvm::Triple::x86_64: {
47 bool X32 = Triple.getEnvironment() == llvm::Triple::GNUX32;
48
49- LibDir = X32 ? "libx32" : "lib64";
50+ LibDir = "lib";
51 Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
52 break;
53 }
54--
552.20.1
56