3 files changed, 53 insertions, 1 deletions

diff --git a/recipes-devtools/clang/clang/0001-ARMTargetLowering-Handle-MUSLEABI-to-fix-AEABI-helpe.patch b/recipes-devtools/clang/clang/0001-ARMTargetLowering-Handle-MUSLEABI-to-fix-AEABI-helpe.patch
new file mode 100644
index 0000000..78756cd
--- /dev/null
+++ b/recipes-devtools/clang/clang/0001-ARMTargetLowering-Handle-MUSLEABI-to-fix-AEABI-helpe.patch
@@ -0,0 +1,51 @@
+From fded84c3b6db127a0520b8216a82fe6c4b400247 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominic=20Sacr=C3=A9?= <dominic.sacre@gmx.de>
+Date: Tue, 14 Jun 2016 09:50:21 +0200
+Subject: [PATCH] ARMTargetLowering: Handle MUSLEABI to fix AEABI helper
+ calling convention
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+AEABI floating point helper functions always use AAPCS (soft-float)
+calling convention. Recognize MUSLEABI targets to fix the code generated
+for musl-based hard-float builds.
+
+Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
+---
+ lib/Target/ARM/ARMISelLowering.cpp | 2 +-
+ lib/Target/ARM/ARMSubtarget.h      | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Target/ARM/ARMISelLowering.cpp b/lib/Target/ARM/ARMISelLowering.cpp
+index a2daa89..f4ed6f3 100644
+--- a/lib/Target/ARM/ARMISelLowering.cpp
++++ b/lib/Target/ARM/ARMISelLowering.cpp
+@@ -254,7 +254,7 @@ ARMTargetLowering::ARMTargetLowering(const TargetMachine &TM,
+   // RTLIB
+   if (Subtarget->isAAPCS_ABI() &&
+       (Subtarget->isTargetAEABI() || Subtarget->isTargetGNUAEABI() ||
+-       Subtarget->isTargetAndroid())) {
++       Subtarget->isTargetAndroid() || Subtarget->isTargetMUSLEABI())) {
+     static const struct {
+       const RTLIB::Libcall Op;
+       const char * const Name;
+diff --git a/lib/Target/ARM/ARMSubtarget.h b/lib/Target/ARM/ARMSubtarget.h
+index 4d54e57..3ba330b 100644
+--- a/lib/Target/ARM/ARMSubtarget.h
++++ b/lib/Target/ARM/ARMSubtarget.h
+@@ -399,6 +399,11 @@ public:
+             TargetTriple.getEnvironment() == Triple::GNUEABIHF) &&
+            !isTargetDarwin() && !isTargetWindows();
+   }
++  bool isTargetMUSLEABI() const {
++    return (TargetTriple.getEnvironment() == Triple::MUSLEABI ||
++            TargetTriple.getEnvironment() == Triple::MUSLEABIHF) &&
++           !isTargetDarwin() && !isTargetWindows();
++  }
+ 
+   // ARM Targets that support EHABI exception handling standard
+   // Darwin uses SjLj. Other targets might need more checks.
+-- 
+2.8.4
+
diff --git a/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch b/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch
index 3fdf4b6..a6c8122 100644
--- a/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch
+++ b/recipes-devtools/clang/clang/0001-triplet-Add-musl-support.patch
@@ -61,10 +61,10 @@ index 1967fac..f8b6236 100644
      .StartsWith("gnueabihf", Triple::GNUEABIHF)
      .StartsWith("gnueabi", Triple::GNUEABI)
      .StartsWith("gnux32", Triple::GNUX32)
-+    .StartsWith("musl", Triple::MUSL)
 +    .StartsWith("musleabihf", Triple::MUSLEABIHF)
 +    .StartsWith("musleabi", Triple::MUSLEABI)
 +    .StartsWith("muslx32", Triple::MUSLX32)
++    .StartsWith("musl", Triple::MUSL)
      .StartsWith("code16", Triple::CODE16)
      .StartsWith("gnu", Triple::GNU)
      .StartsWith("android", Triple::Android)
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 2a6aa58..286906d 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -18,6 +18,7 @@ SRC_URI = "${LLVM_GIT}/llvm.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};n
            file://0001-Remove-CMAKE_CROSSCOMPILING-so-it-can-cross-compile.patch \
            file://0002-Do-not-assume-linux-glibc.patch \
            file://0001-triplet-Add-musl-support.patch \
+           file://0001-ARMTargetLowering-Handle-MUSLEABI-to-fix-AEABI-helpe.patch \
            file://0001-driver-Add-musl-ldso-support.patch;patchdir=tools/clang \
            file://0001-driver-Use-lib-for-ldso-on-OE.patch;patchdir=tools/clang \
            file://0001-musl-ppc-does-not-support-128-bit-long-double.patch;patchdir=tools/clang \