dffb85bee2
Use cmake to build. This is the favored method of building by upstream. Consequences: - Build lld again - Build LLVMgold - Enable sanitizers on non-musl platforms - Remove llvm-doc (not built by cmake, quite useless) - Use versioned binary names - Could use ninja with make_cmd=ninja and configure -Gninja, but we stick to make for now. Also cleaned up and fixed remaining patches.
88 lines
3.3 KiB
Diff
88 lines
3.3 KiB
Diff
From 58be6f7fb164dbf42fdd28ce6474dbe4bc5ca401 Mon Sep 17 00:00:00 2001
|
|
From: Andrea Brancaleoni <miwaxe@gmail.com>
|
|
Date: Tue, 8 Sep 2015 21:53:42 +0200
|
|
Subject: [PATCH 2/3] musl triple
|
|
|
|
---
|
|
include/llvm/ADT/Triple.h | 4 ++++
|
|
lib/Support/Triple.cpp | 6 ++++++
|
|
lib/Target/ARM/ARMSubtarget.h | 3 +++
|
|
lib/Target/ARM/ARMTargetMachine.cpp | 2 ++
|
|
4 files changed, 15 insertions(+)
|
|
|
|
diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
|
|
index 947812d..d2a6bbe 100644
|
|
--- a/include/llvm/ADT/Triple.h
|
|
+++ b/include/llvm/ADT/Triple.h
|
|
@@ -167,6 +167,10 @@ public:
|
|
EABIHF,
|
|
Android,
|
|
|
|
+ Musl,
|
|
+ MuslEABI,
|
|
+ MuslEABIHF,
|
|
+
|
|
MSVC,
|
|
Itanium,
|
|
Cygnus,
|
|
diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
|
|
index c6646fb..8d47ad9 100644
|
|
--- a/lib/Support/Triple.cpp
|
|
+++ b/lib/Support/Triple.cpp
|
|
@@ -192,6 +192,9 @@ const char *Triple::getEnvironmentTypeName(EnvironmentType Kind) {
|
|
case CODE16: return "code16";
|
|
case EABI: return "eabi";
|
|
case EABIHF: return "eabihf";
|
|
+ case Musl: return "musl";
|
|
+ case MuslEABIHF: return "musleabihf";
|
|
+ case MuslEABI: return "musleabi";
|
|
case Android: return "android";
|
|
case MSVC: return "msvc";
|
|
case Itanium: return "itanium";
|
|
@@ -427,6 +430,9 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
|
|
.StartsWith("code16", Triple::CODE16)
|
|
.StartsWith("gnu", Triple::GNU)
|
|
.StartsWith("android", Triple::Android)
|
|
+ .StartsWith("musleabihf", Triple::MuslEABIHF)
|
|
+ .StartsWith("musleabi", Triple::MuslEABI)
|
|
+ .StartsWith("musl", Triple::Musl)
|
|
.StartsWith("msvc", Triple::MSVC)
|
|
.StartsWith("itanium", Triple::Itanium)
|
|
.StartsWith("cygnus", Triple::Cygnus)
|
|
diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp
|
|
index 93495d6..56e6b7f 100644
|
|
--- a/lib/Target/ARM/ARMTargetMachine.cpp
|
|
+++ b/lib/Target/ARM/ARMTargetMachine.cpp
|
|
@@ -97,6 +97,8 @@ computeTargetABI(const Triple &TT, StringRef CPU,
|
|
case llvm::Triple::GNUEABIHF:
|
|
case llvm::Triple::EABIHF:
|
|
case llvm::Triple::EABI:
|
|
+ case llvm::Triple::MuslEABI:
|
|
+ case llvm::Triple::MuslEABIHF:
|
|
TargetABI = ARMBaseTargetMachine::ARM_ABI_AAPCS;
|
|
break;
|
|
case llvm::Triple::GNU:
|
|
--
|
|
2.5.1
|
|
|
|
--- llvm-3.8.0.src/lib/Target/ARM/ARMSubtarget.h.orig 2016-03-09 13:34:16.919107629 +0100
|
|
+++ llvm-3.8.0.src/lib/Target/ARM/ARMSubtarget.h 2016-03-09 13:38:12.019342405 +0100
|
|
@@ -405,8 +405,10 @@
|
|
bool isTargetEHABICompatible() const {
|
|
return (TargetTriple.getEnvironment() == Triple::EABI ||
|
|
TargetTriple.getEnvironment() == Triple::GNUEABI ||
|
|
+ TargetTriple.getEnvironment() == Triple::MuslEABI ||
|
|
TargetTriple.getEnvironment() == Triple::EABIHF ||
|
|
TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
|
|
+ TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
|
|
isTargetAndroid()) &&
|
|
!isTargetDarwin() && !isTargetWindows();
|
|
}
|
|
@@ -415,6 +417,7 @@
|
|
// FIXME: this is invalid for WindowsCE
|
|
return TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
|
|
TargetTriple.getEnvironment() == Triple::EABIHF ||
|
|
+ TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
|
|
isTargetWindows() || isAAPCS16_ABI();
|
|
}
|
|
bool isTargetAndroid() const { return TargetTriple.isAndroid(); }
|