compiler-rt: Fix build with OE target triplets

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 70 insertions, 2 deletions

diff --git a/recipes-devtools/clang/compiler-rt/0001-3.9-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch b/recipes-devtools/clang/compiler-rt/0001-3.9-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
new file mode 100644
index 0000000..1d02c4c
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0001-3.9-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
@@ -0,0 +1,33 @@
+From eeb6437d951a5316a5d743578ccb284db9d57caa Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 10 May 2016 10:37:55 -0700
+Subject: [PATCH] Remove fatal check for explicit
+ COMPILER_RT_DEFAULT_TARGET_ARCH
+
+In OE, we do not deduce float-abi via target triplet
+but via a CFLAGS option, and we do not have possibility
+to build both hf and sf in same toolchain, therefore lets
+ignore the test, we are doing the right job from recipe
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ cmake/Modules/CompilerRTUtils.cmake | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake
+index b4a2b48..086d9ba 100644
+--- a/cmake/Modules/CompilerRTUtils.cmake
++++ b/cmake/Modules/CompilerRTUtils.cmake
+@@ -125,9 +125,5 @@ macro(test_target_arch arch def)
+   endif()
+   if(${CAN_TARGET_${arch}})
+     list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
+-  elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "${arch}" AND
+-         COMPILER_RT_HAS_EXPLICIT_DEFAULT_TARGET_TRIPLE)
+-    # Bail out if we cannot target the architecture we plan to test.
+-    message(FATAL_ERROR "Cannot compile for ${arch}:\n${TARGET_${arch}_OUTPUT}")
+   endif()
+ endmacro()
+-- 
+2.8.2
+
diff --git a/recipes-devtools/clang/compiler-rt/0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch b/recipes-devtools/clang/compiler-rt/0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
new file mode 100644
index 0000000..d741b55
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch
@@ -0,0 +1,34 @@
+From 14f4f8e55b363037ae881084e4594934a869cf5d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 10 May 2016 10:37:55 -0700
+Subject: [PATCH] Remove fatal check for explicit
+ COMPILER_RT_DEFAULT_TARGET_ARCH
+
+In OE, we do not deduce float-abi via target triplet
+but via a CFLAGS option, and we do not have possibility
+to build both hf and sf in same toolchain, therefore lets
+ignore the test, we are doing the right job from recipe
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ cmake/config-ix.cmake | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
+index 264085e..299682d 100644
+--- a/cmake/config-ix.cmake
++++ b/cmake/config-ix.cmake
+@@ -128,10 +128,6 @@ macro(test_target_arch arch def)
+   endif()
+   if(${CAN_TARGET_${arch}})
+     list(APPEND COMPILER_RT_SUPPORTED_ARCH ${arch})
+-  elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "${arch}" AND
+-         COMPILER_RT_HAS_EXPLICIT_DEFAULT_TARGET_TRIPLE)
+-    # Bail out if we cannot target the architecture we plan to test.
+-    message(FATAL_ERROR "Cannot compile for ${arch}:\n${TARGET_${arch}_OUTPUT}")
+   endif()
+ endmacro()
+ 
+-- 
+2.8.2
+
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index a9391ed..c5f0987 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -7,10 +7,10 @@ LICENSE = "MIT | NCSA"
 SECTION = "base"
 INHIBIT_DEFAULT_DEPS = "1"
 
-DEPENDS += "clang-cross-${TARGET_ARCH} virtual/${TARGET_PREFIX}libc-for-gcc"
-
 require clang.inc
 
+DEPENDS += "clang-cross-${TARGET_ARCH} virtual/${TARGET_PREFIX}libc-for-gcc"
+
 PV .= "+git${SRCPV}"
 
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=27b14ab4ce08d04c3a9a5f0ed7997362; \
@@ -18,6 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=27b14ab4ce08d04c3a9a5f0ed7997362; \
 SRC_URI =  "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${BRANCH};name=compiler-rt \
             file://0001-support-a-new-embedded-linux-target.patch \
             file://0001-Simplify-cross-compilation.-Don-t-use-native-compile.patch \
+            file://0001-Remove-fatal-check-for-explicit-COMPILER_RT_DEFAULT_.patch \
 "
 
 SRCREV_FORMAT = "compiler-rt"