compiler-rt: Fix build on qemuarm

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

2 files changed, 148 insertions, 0 deletions

diff --git a/recipes-devtools/clang/compiler-rt/0005-builtins-Specifiy-builtins-using-VFP-separately.patch b/recipes-devtools/clang/compiler-rt/0005-builtins-Specifiy-builtins-using-VFP-separately.patch
new file mode 100644
index 0000000..5e7a43b
--- /dev/null
+++ b/recipes-devtools/clang/compiler-rt/0005-builtins-Specifiy-builtins-using-VFP-separately.patch
@@ -0,0 +1,147 @@
+From 59cffbd825a2f9c9c9b21d1314f7a2824e01a158 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 13 Aug 2016 00:33:15 +0000
+Subject: [PATCH] builtins: Specifiy builtins using VFP separately
+
+This helps in compiling compiler-rt for armv5
+using soft-float
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/builtins/CMakeLists.txt | 84 +++++++++++++++++++++++----------------------
+ 1 file changed, 43 insertions(+), 41 deletions(-)
+
+diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt
+index d5a1efe..d84bf96 100644
+--- a/lib/builtins/CMakeLists.txt
++++ b/lib/builtins/CMakeLists.txt
+@@ -257,8 +257,6 @@ else () # MSVC
+ endif () # if (NOT MSVC)
+ 
+ set(arm_SOURCES
+-  arm/adddf3vfp.S
+-  arm/addsf3vfp.S
+   arm/aeabi_cdcmp.S
+   arm/aeabi_cdcmpeq_check_nan.c
+   arm/aeabi_cfcmp.S
+@@ -281,10 +279,44 @@ set(arm_SOURCES
+   arm/clzdi2.S
+   arm/clzsi2.S
+   arm/comparesf2.S
+-  arm/divdf3vfp.S
+   arm/divmodsi4.S
+-  arm/divsf3vfp.S
+   arm/divsi3.S
++  arm/modsi3.S
++  arm/switch16.S
++  arm/switch32.S
++  arm/switch8.S
++  arm/switchu8.S
++  arm/sync_fetch_and_add_4.S
++  arm/sync_fetch_and_add_8.S
++  arm/sync_fetch_and_and_4.S
++  arm/sync_fetch_and_and_8.S
++  arm/sync_fetch_and_max_4.S
++  arm/sync_fetch_and_max_8.S
++  arm/sync_fetch_and_min_4.S
++  arm/sync_fetch_and_min_8.S
++  arm/sync_fetch_and_nand_4.S
++  arm/sync_fetch_and_nand_8.S
++  arm/sync_fetch_and_or_4.S
++  arm/sync_fetch_and_or_8.S
++  arm/sync_fetch_and_sub_4.S
++  arm/sync_fetch_and_sub_8.S
++  arm/sync_fetch_and_umax_4.S
++  arm/sync_fetch_and_umax_8.S
++  arm/sync_fetch_and_umin_4.S
++  arm/sync_fetch_and_umin_8.S
++  arm/sync_fetch_and_xor_4.S
++  arm/sync_fetch_and_xor_8.S
++  arm/sync_synchronize.S
++  arm/udivmodsi4.S
++  arm/udivsi3.S
++  arm/umodsi3.S
++  ${GENERIC_SOURCES})
++
++set(armvfp_SOURCES
++  arm/adddf3vfp.S
++  arm/addsf3vfp.S
++  arm/divdf3vfp.S
++  arm/divsf3vfp.S
+   arm/eqdf2vfp.S
+   arm/eqsf2vfp.S
+   arm/extendsfdf2vfp.S
+@@ -304,7 +336,6 @@ set(arm_SOURCES
+   arm/lesf2vfp.S
+   arm/ltdf2vfp.S
+   arm/ltsf2vfp.S
+-  arm/modsi3.S
+   arm/muldf3vfp.S
+   arm/mulsf3vfp.S
+   arm/nedf2vfp.S
+@@ -315,38 +346,9 @@ set(arm_SOURCES
+   arm/save_vfp_d8_d15_regs.S
+   arm/subdf3vfp.S
+   arm/subsf3vfp.S
+-  arm/switch16.S
+-  arm/switch32.S
+-  arm/switch8.S
+-  arm/switchu8.S
+-  arm/sync_fetch_and_add_4.S
+-  arm/sync_fetch_and_add_8.S
+-  arm/sync_fetch_and_and_4.S
+-  arm/sync_fetch_and_and_8.S
+-  arm/sync_fetch_and_max_4.S
+-  arm/sync_fetch_and_max_8.S
+-  arm/sync_fetch_and_min_4.S
+-  arm/sync_fetch_and_min_8.S
+-  arm/sync_fetch_and_nand_4.S
+-  arm/sync_fetch_and_nand_8.S
+-  arm/sync_fetch_and_or_4.S
+-  arm/sync_fetch_and_or_8.S
+-  arm/sync_fetch_and_sub_4.S
+-  arm/sync_fetch_and_sub_8.S
+-  arm/sync_fetch_and_umax_4.S
+-  arm/sync_fetch_and_umax_8.S
+-  arm/sync_fetch_and_umin_4.S
+-  arm/sync_fetch_and_umin_8.S
+-  arm/sync_fetch_and_xor_4.S
+-  arm/sync_fetch_and_xor_8.S
+-  arm/sync_synchronize.S
+   arm/truncdfsf2vfp.S
+-  arm/udivmodsi4.S
+-  arm/udivsi3.S
+-  arm/umodsi3.S
+   arm/unorddf2vfp.S
+-  arm/unordsf2vfp.S
+-  ${GENERIC_SOURCES})
++  arm/unordsf2vfp.S)
+ 
+ set(aarch64_SOURCES
+   comparetf2.c
+@@ -367,16 +369,16 @@ set(aarch64_SOURCES
+   trunctfsf2.c
+   ${GENERIC_SOURCES})
+ 
+-set(armhf_SOURCES ${arm_SOURCES})
+-set(armv7_SOURCES ${arm_SOURCES})
+-set(armv7s_SOURCES ${arm_SOURCES})
+-set(armv7k_SOURCES ${arm_SOURCES})
++set(armhf_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
++set(armv7_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
++set(armv7s_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
++set(armv7k_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
+ set(arm64_SOURCES ${aarch64_SOURCES})
+ 
+ # macho_embedded archs
+ set(armv6m_SOURCES ${GENERIC_SOURCES})
+-set(armv7m_SOURCES ${arm_SOURCES})
+-set(armv7em_SOURCES ${arm_SOURCES})
++set(armv7m_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
++set(armv7em_SOURCES ${arm_SOURCES} ${armvfp_SOURCES})
+ 
+ set(mips_SOURCES ${GENERIC_SOURCES})
+ set(mipsel_SOURCES ${mips_SOURCES})
+-- 
+1.9.1
+
diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb
index 6b67d00..7aa3fd6 100644
--- a/recipes-devtools/clang/compiler-rt_git.bb
+++ b/recipes-devtools/clang/compiler-rt_git.bb
@@ -21,6 +21,7 @@ SRC_URI =  "${LLVM_GIT}/compiler-rt.git;protocol=${LLVM_GIT_PROTOCOL};branch=${B
             file://0002-support-a-new-embedded-linux-target.patch \
             file://0003-Simplify-cross-compilation.-Don-t-use-native-compile.patch \
             file://0004-Disable-tsan-on-OE-glibc.patch \
+            file://0005-builtins-Specifiy-builtins-using-VFP-separately.patch \
 "
 
 SRCREV_FORMAT = "compiler-rt"