mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
85 lines
3.5 KiB
Diff
85 lines
3.5 KiB
Diff
From 8f14313cb2ee5221e481e292bcd066a473b1edb8 Mon Sep 17 00:00:00 2001
|
|
From: Jakub Jirutka <jakub@jirutka.cz>
|
|
Date: Sun, 16 Apr 2017 16:49:00 +0100
|
|
Subject: [PATCH 4/7] Add musl targets
|
|
|
|
---
|
|
lib/Driver/ToolChains/Gnu.cpp | 6 ++++--
|
|
lib/Driver/ToolChains/Linux.cpp | 15 ++++++++++++---
|
|
2 files changed, 16 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp
|
|
index 72a9f85..40ad3f5 100644
|
|
--- a/lib/Driver/ToolChains/Gnu.cpp
|
|
+++ b/lib/Driver/ToolChains/Gnu.cpp
|
|
@@ -1917,7 +1917,8 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
|
|
case llvm::Triple::arm:
|
|
case llvm::Triple::thumb:
|
|
LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
|
|
- if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {
|
|
+ if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
|
|
+ TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
|
|
TripleAliases.append(begin(ARMHFTriples), end(ARMHFTriples));
|
|
} else {
|
|
TripleAliases.append(begin(ARMTriples), end(ARMTriples));
|
|
@@ -1926,7 +1927,8 @@ bool Generic_GCC::GCCInstallationDetector::getBiarchSibling(Multilib &M) const {
|
|
case llvm::Triple::armeb:
|
|
case llvm::Triple::thumbeb:
|
|
LibDirs.append(begin(ARMebLibDirs), end(ARMebLibDirs));
|
|
- if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF) {
|
|
+ if (TargetTriple.getEnvironment() == llvm::Triple::GNUEABIHF ||
|
|
+ TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
|
|
TripleAliases.append(begin(ARMebHFTriples), end(ARMebHFTriples));
|
|
} else {
|
|
TripleAliases.append(begin(ARMebTriples), end(ARMebTriples));
|
|
diff --git a/lib/Driver/ToolChains/Linux.cpp b/lib/Driver/ToolChains/Linux.cpp
|
|
index 1201df6..9eea3f0 100644
|
|
--- a/lib/Driver/ToolChains/Linux.cpp
|
|
+++ b/lib/Driver/ToolChains/Linux.cpp
|
|
@@ -54,7 +54,8 @@ static std::string getMultiarchTriple(const Driver &D,
|
|
// regardless of what the actual target triple is.
|
|
case llvm::Triple::arm:
|
|
case llvm::Triple::thumb:
|
|
- if (TargetEnvironment == llvm::Triple::GNUEABIHF) {
|
|
+ if (TargetEnvironment == llvm::Triple::GNUEABIHF ||
|
|
+ TargetEnvironment == llvm::Triple::MuslEABIHF) {
|
|
if (D.getVFS().exists(SysRoot + "/lib/arm-linux-gnueabihf"))
|
|
return "arm-linux-gnueabihf";
|
|
} else {
|
|
@@ -64,7 +65,8 @@ static std::string getMultiarchTriple(const Driver &D,
|
|
break;
|
|
case llvm::Triple::armeb:
|
|
case llvm::Triple::thumbeb:
|
|
- if (TargetEnvironment == llvm::Triple::GNUEABIHF) {
|
|
+ if (TargetEnvironment == llvm::Triple::GNUEABIHF ||
|
|
+ TargetEnvironment == llvm::Triple::MuslEABIHF) {
|
|
if (D.getVFS().exists(SysRoot + "/lib/armeb-linux-gnueabihf"))
|
|
return "armeb-linux-gnueabihf";
|
|
} else {
|
|
@@ -434,6 +436,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
|
|
ArchName = "armeb";
|
|
IsArm = true;
|
|
break;
|
|
+ case llvm::Triple::ppc:
|
|
+ ArchName = "powerpc";
|
|
+ break;
|
|
+ case llvm::Triple::x86:
|
|
+ ArchName = "i386";
|
|
+ break;
|
|
default:
|
|
ArchName = Triple.getArchName().str();
|
|
}
|
|
@@ -644,7 +652,8 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
|
|
break;
|
|
case llvm::Triple::arm:
|
|
case llvm::Triple::thumb:
|
|
- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
|
|
+ if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF ||
|
|
+ getTriple().getEnvironment() == llvm::Triple::MuslEABIHF)
|
|
MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
|
|
else
|
|
MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
|
|
--
|
|
2.14.1
|
|
|