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
64
65
66
67
68
69
70
|
From 17e1e38501cb4008c53727d88ef87d2c89182008 Mon Sep 17 00:00:00 2001
From: Oleksandr Ocheretnyi <oocheret@cisco.com>
Date: Wed, 15 Apr 2020 00:08:39 +0300
Subject: [PATCH 24/24] clang: driver: Add dyld-prefix when checking sysroot
for ldso path
* the dyld-prefix shall be taken into account when the default
path for the dynamic linker has to be checked.
* this patch shall be used as annex to the next patch:
'clang: driver: Check sysroot for ldso path' which includes
the usrmerge scenario.
Signed-off-by: Oleksandr Ocheretnyi <oocheret@cisco.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
clang/lib/Driver/ToolChains/Linux.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index 9128d4e0fa0..7f7d752a9a1 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -507,8 +507,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
LibDir = "lib64";
Loader =
(tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
- if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
- getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
+ if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
+ getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
LibDir = "lib";
}
break;
@@ -516,8 +516,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
LibDir = "lib64";
Loader =
(tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
- if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
- getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
+ if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
+ getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
LibDir = "lib";
}
break;
@@ -541,8 +541,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
case llvm::Triple::sparcv9:
LibDir = "lib64";
Loader = "ld-linux.so.2";
- if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
- getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
+ if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
+ getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
LibDir = "lib";
}
break;
@@ -559,8 +559,8 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
LibDir = X32 ? "libx32" : "lib64";
Loader = X32 ? "ld-linux-x32.so.2" : "ld-linux-x86-64.so.2";
- if (!getVFS().exists(getDriver().SysRoot + "/" + LibDir + "/" + Loader) &&
- getVFS().exists(getDriver().SysRoot + "/lib/" + Loader)) {
+ if (!getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/" + LibDir + "/" + Loader) &&
+ getVFS().exists(getDriver().SysRoot + getDriver().DyldPrefix + "/lib/" + Loader)) {
LibDir = "lib";
}
break;
--
2.27.0
|
