blob: 3b9289772127b65707647af3964f06b36e27e0c2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From b9831e3886b22d243eeb01f0ae67e9485aafd64b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 21 May 2016 21:52:36 -0700
Subject: [PATCH 01/18] 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
Make sure that the change only happens for cross
compilation on x86_64 architecture
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
clang/lib/Driver/ToolChains/Linux.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index e9169e91fd4..9c08a794f5c 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -595,12 +595,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;
@@ -622,7 +622,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:
@@ -635,8 +635,10 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
break;
case llvm::Triple::x86_64: {
bool X32 = Triple.getEnvironment() == llvm::Triple::GNUX32;
-
- LibDir = X32 ? "libx32" : "lib64";
+ if (Triple.getEnvironment() == llvm::Triple::GNU)
+ LibDir = X32 ? "libx32" : "lib64";
+ else
+ LibDir = "lib";
Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
break;
}
--
2.21.0
|
