From 69206a5552d29bbb254812fae21f1efbea6a814f Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Sat, 30 Mar 2019 15:14:22 +0100 Subject: [PATCH] llvm8: add mips* triplets [ci skip] closes #9220 --- .../cfe/cfe-004-add-musl-triples.patch | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/srcpkgs/llvm8/files/patches/cfe/cfe-004-add-musl-triples.patch b/srcpkgs/llvm8/files/patches/cfe/cfe-004-add-musl-triples.patch index dc1038de10a..913ddad58d8 100644 --- a/srcpkgs/llvm8/files/patches/cfe/cfe-004-add-musl-triples.patch +++ b/srcpkgs/llvm8/files/patches/cfe/cfe-004-add-musl-triples.patch @@ -1,6 +1,6 @@ ---- clang/lib/Driver/ToolChains/Gnu.cpp -+++ clang/lib/Driver/ToolChains/Gnu.cpp -@@ -1871,7 +1871,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +--- lib/Driver/ToolChains/Gnu.cpp.orig 2019-03-30 15:08:33.136000000 +0100 ++++ lib/Driver/ToolChains/Gnu.cpp 2019-03-30 15:10:24.666000000 +0100 +@@ -1871,7 +1871,7 @@ static const char *const AArch64LibDirs[] = {"/lib64", "/lib"}; static const char *const AArch64Triples[] = { "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux", @@ -9,7 +9,7 @@ static const char *const AArch64beLibDirs[] = {"/lib"}; static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu", "aarch64_be-linux-gnu"}; -@@ -1882,7 +1882,10 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -1882,7 +1882,10 @@ static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", "armv7hl-redhat-linux-gnueabi", "armv6hl-suse-linux-gnueabi", @@ -21,7 +21,7 @@ static const char *const ARMebLibDirs[] = {"/lib"}; static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", "armeb-linux-androideabi"}; -@@ -1896,7 +1898,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -1896,7 +1899,8 @@ "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", @@ -31,7 +31,7 @@ static const char *const X32LibDirs[] = {"/libx32"}; static const char *const X86LibDirs[] = {"/lib32", "/lib"}; static const char *const X86Triples[] = { -@@ -1905,7 +1908,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( +@@ -1905,12 +1909,13 @@ "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux", "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu", "i686-linux-android", "i386-gnu", "i486-gnu", @@ -40,7 +40,14 @@ static const char *const MIPSLibDirs[] = {"/lib"}; static const char *const MIPSTriples[] = { -@@ -1945,11 +1948,13 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + "mips-linux-gnu", "mips-mti-linux", "mips-mti-linux-gnu", +- "mips-img-linux-gnu", "mipsisa32r6-linux-gnu"}; ++ "mips-img-linux-gnu", "mipsisa32r6-linux-gnu", "mips-linux-musl", ++ "mipsel-linux-musl", "mipsel-linux-muslhf", "mips-linux-muslhf"}; + static const char *const MIPSELLibDirs[] = {"/lib"}; + static const char *const MIPSELTriples[] = { + "mipsel-linux-gnu", "mips-img-linux-gnu", "mipsisa32r6el-linux-gnu", +@@ -1945,11 +1950,13 @@ static const char *const PPC64LibDirs[] = {"/lib64", "/lib"}; static const char *const PPC64Triples[] = { "powerpc64-linux-gnu", "powerpc64-unknown-linux-gnu",