aboutsummaryrefslogtreecommitdiffstats
path: root/main/clang/10-add-musl-triples.patch
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-06-07 12:33:50 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-11 13:35:29 +0000
commit54db62760803072c5308e62d769048d2f50b68be (patch)
tree547e3585968111e805c79fb16313436a8e615b1d /main/clang/10-add-musl-triples.patch
parent3c17be04ec487849bbaced32301bcb58deb996f4 (diff)
main/clang: upgrade to 8.0.0
Diffstat (limited to 'main/clang/10-add-musl-triples.patch')
-rw-r--r--main/clang/10-add-musl-triples.patch38
1 files changed, 11 insertions, 27 deletions
diff --git a/main/clang/10-add-musl-triples.patch b/main/clang/10-add-musl-triples.patch
index fa837bbdef8..171467470bf 100644
--- a/main/clang/10-add-musl-triples.patch
+++ b/main/clang/10-add-musl-triples.patch
@@ -1,42 +1,26 @@
--- a/lib/Driver/ToolChains/Gnu.cpp
+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -1813,7 +1814,9 @@
- static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
- "armv7hl-redhat-linux-gnueabi",
- "armv6hl-suse-linux-gnueabi",
-- "armv7hl-suse-linux-gnueabi"};
-+ "armv7hl-suse-linux-gnueabi",
-+ "arm-linux-musleabihf",
-+ "armv7l-linux-musleabihf"};
- static const char *const ARMebLibDirs[] = {"/lib"};
- static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
- "armeb-linux-androideabi"};
---- a/lib/Driver/ToolChains/Gnu.cpp
-+++ b/lib/Driver/ToolChains/Gnu.cpp
-@@ -1812,7 +1812,7 @@
+@@ -1871,6 +1871,7 @@
static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
static const char *const AArch64Triples[] = {
"aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
-- "aarch64-suse-linux"};
-+ "aarch64-suse-linux","aarch64-linux-musl"};
++ "aarch64-linux-musl",
+ "aarch64-suse-linux", "aarch64-linux-android"};
static const char *const AArch64beLibDirs[] = {"/lib"};
static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
- "aarch64_be-linux-gnu"};
-@@ -1837,14 +1837,15 @@
+@@ -1898,6 +1899,7 @@
"x86_64-redhat-linux", "x86_64-suse-linux",
"x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
"x86_64-slackware-linux", "x86_64-unknown-linux",
-- "x86_64-amazon-linux"};
-+ "x86_64-amazon-linux", "x86_64-linux-musl"};
++ "x86_64-linux-musl",
+ "x86_64-amazon-linux", "x86_64-linux-android"};
static const char *const X32LibDirs[] = {"/libx32"};
static const char *const X86LibDirs[] = {"/lib32", "/lib"};
- static const char *const X86Triples[] = {
- "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu",
- "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux",
+@@ -1907,6 +1909,7 @@
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
-- "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu"};
-+ "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
-+ "i686-linux-musl"};
+ "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
+ "i686-linux-android", "i386-gnu", "i486-gnu",
++ "i686-linux-musl",
+ "i586-gnu", "i686-gnu"};
static const char *const MIPSLibDirs[] = {"/lib"};
- static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux",