diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-01-28 11:35:50 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-03-01 11:12:14 -0800 |
commit | 596e0e7c195378a1b02e6ebcad0fb98054230e28 (patch) | |
tree | a1ac857fee80a85b588a9b9653e4a9a54e4e79c8 /recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch | |
parent | 6611405d0e50724afe4b6ee1d6e80417a31721d6 (diff) | |
download | meta-clang-596e0e7c195378a1b02e6ebcad0fb98054230e28.tar.gz |
clang: Update to 12.0.0 RC2
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch')
-rw-r--r-- | recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch b/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch index c363b15..08f4222 100644 --- a/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch +++ b/recipes-devtools/clang/clang/0014-clang-Fix-ldso-for-musl-on-x86-and-x32-architectures.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9413eabd3659763c550d6beb2d5290228758a53b Mon Sep 17 00:00:00 2001 | 1 | From 7b8ad95e1e5953234df3e06d5d01cbdd1a8c051d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 16 Aug 2017 15:16:15 -0700 | 3 | Date: Wed, 16 Aug 2017 15:16:15 -0700 |
4 | Subject: [PATCH 14/24] clang: Fix ldso for musl on x86 and x32 architectures | 4 | Subject: [PATCH] clang: Fix ldso for musl on x86 and x32 architectures |
5 | 5 | ||
6 | x32 linker is called ld-musl-x32.so.1 and x86 linker | 6 | x32 linker is called ld-musl-x32.so.1 and x86 linker |
7 | is called ld-musl-i386.so.1, Currently, linker for | 7 | is called ld-musl-i386.so.1, Currently, linker for |
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
14 | 1 file changed, 8 insertions(+) | 14 | 1 file changed, 8 insertions(+) |
15 | 15 | ||
16 | diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp | 16 | diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp |
17 | index d908e40d86e..add122d5cc8 100644 | 17 | index 520ae5a7d2cf..8b72e8f505fe 100644 |
18 | --- a/clang/lib/Driver/ToolChains/Linux.cpp | 18 | --- a/clang/lib/Driver/ToolChains/Linux.cpp |
19 | +++ b/clang/lib/Driver/ToolChains/Linux.cpp | 19 | +++ b/clang/lib/Driver/ToolChains/Linux.cpp |
20 | @@ -422,6 +422,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { | 20 | @@ -435,6 +435,7 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { |
21 | if (Triple.isMusl()) { | 21 | if (Triple.isMusl()) { |
22 | std::string ArchName; | 22 | std::string ArchName; |
23 | bool IsArm = false; | 23 | bool IsArm = false; |
@@ -25,7 +25,7 @@ index d908e40d86e..add122d5cc8 100644 | |||
25 | 25 | ||
26 | switch (Arch) { | 26 | switch (Arch) { |
27 | case llvm::Triple::arm: | 27 | case llvm::Triple::arm: |
28 | @@ -434,6 +435,13 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { | 28 | @@ -447,6 +448,13 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { |
29 | ArchName = "armeb"; | 29 | ArchName = "armeb"; |
30 | IsArm = true; | 30 | IsArm = true; |
31 | break; | 31 | break; |
@@ -39,6 +39,3 @@ index d908e40d86e..add122d5cc8 100644 | |||
39 | default: | 39 | default: |
40 | ArchName = Triple.getArchName().str(); | 40 | ArchName = Triple.getArchName().str(); |
41 | } | 41 | } |
42 | -- | ||
43 | 2.27.0 | ||
44 | |||