From 420899503863473ba40ba68a81134dbcb3c330e5 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Tue, 8 Sep 2015 22:24:52 +0200 Subject: [PATCH 3/7] add musl triples --- lib/Driver/ToolChains.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 15e36a1..3cd6dd1 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -1275,7 +1275,10 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { static const char *const ARMTriples[] = {"arm-linux-gnueabi", "arm-linux-androideabi"}; static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", - "armv7hl-redhat-linux-gnueabi"}; + "armv7hl-redhat-linux-gnueabi", + "armv6-linux-musleabihf", "armv6l-linux-musleabihf", + "armv7-linux-musleabihf", "armv7l-linux-musleabihf", + "arm-linux-musleabihf" }; static const char *const ARMebLibDirs[] = {"/lib"}; static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", "armeb-linux-androideabi"}; @@ -1289,6 +1292,7 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { "x86_64-redhat-linux", "x86_64-suse-linux", "x86_64-manbo-linux-gnu", "x86_64-linux-gnu", "x86_64-slackware-linux", "x86_64-linux-android", + "x86_64-linux-musl", "x86_64-pc-linux-musl", "x86_64-unknown-linux"}; static const char *const X32LibDirs[] = {"/libx32"}; static const char *const X86LibDirs[] = {"/lib32", "/lib"}; @@ -1297,7 +1301,9 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const { "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux", "i486-slackware-linux", "i686-montavista-linux", "i686-linux-android", - "i586-linux-gnu"}; + "i586-linux-gnu", "i486-linux-musl", "i486-pc-linux-musl", + "i686-linux-musl", "i686-pc-linux-musl" + }; static const char *const MIPSLibDirs[] = {"/lib"}; static const char *const MIPSTriples[] = { -- 2.5.1