From af05da2ad0c2af0ef2f22439ce5689e790357595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 29 Mar 2020 08:00:02 +0200
Subject: [PATCH] llvm9: fix armv5* build

---
 .../compiler-rt/compiler-rt-armv5.patch       | 33 ++++++-------------
 srcpkgs/llvm9/template                        | 16 ++++++---
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/llvm9/files/patches/compiler-rt/compiler-rt-armv5.patch b/srcpkgs/llvm9/files/patches/compiler-rt/compiler-rt-armv5.patch
index 36c695c9a2e..f4d2e341b6c 100644
--- a/srcpkgs/llvm9/files/patches/compiler-rt/compiler-rt-armv5.patch
+++ b/srcpkgs/llvm9/files/patches/compiler-rt/compiler-rt-armv5.patch
@@ -1,24 +1,11 @@
---- compiler-rt/lib/builtins/arm/save_vfp_d8_d15_regs.S	2019-12-11 20:15:30.000000000 +0100
-+++ compiler-rt/lib/builtins/arm/save_vfp_d8_d15_regs.S	2020-03-21 05:30:07.342179685 +0100
-@@ -26,7 +26,9 @@
- //
- 	.p2align 2
- DEFINE_COMPILERRT_PRIVATE_FUNCTION(__save_vfp_d8_d15_regs)
-+#if defined(COMPILER_RT_ARMHF_TARGET)
- 	vstmdb	sp!, {d8-d15}           // push registers d8-d15 onto stack
-+#endif
- 	bx      lr                      // return to prolog
- END_COMPILERRT_FUNCTION(__save_vfp_d8_d15_regs)
- 
---- compiler-rt/lib/builtins/arm/restore_vfp_d8_d15_regs.S	2019-12-11 20:15:30.000000000 +0100
-+++ compiler-rt/lib/builtins/arm/restore_vfp_d8_d15_regs.S	2020-03-21 05:29:46.592180512 +0100
-@@ -26,7 +26,9 @@
- //
- 	.p2align 2
- DEFINE_COMPILERRT_PRIVATE_FUNCTION(__restore_vfp_d8_d15_regs)
-+#if defined(COMPILER_RT_ARMHF_TARGET)
- 	vldmia	sp!, {d8-d15}           // pop registers d8-d15 off stack
-+#endif
- 	bx      lr                      // return to prolog
- END_COMPILERRT_FUNCTION(__restore_vfp_d8_d15_regs)
+--- compiler-rt-9.0.1.src/lib/builtins/CMakeLists.txt	2019-12-11 20:15:30.000000000 +0100
++++ compiler-rt-9.0.1.src/lib/builtins/CMakeLists.txt	2020-03-29 07:23:38.172813038 +0200
+@@ -419,8 +419,6 @@
+ )
+ set(arm_Thumb1_SOURCES
+   ${arm_Thumb1_JT_SOURCES}
+-  ${arm_Thumb1_SjLj_EH_SOURCES}
+-  ${arm_Thumb1_VFPv2_SOURCES}
+   ${arm_Thumb1_icache_SOURCES}
+ )
  
diff --git a/srcpkgs/llvm9/template b/srcpkgs/llvm9/template
index d2776c56e0b..350a9d67d16 100644
--- a/srcpkgs/llvm9/template
+++ b/srcpkgs/llvm9/template
@@ -1,4 +1,4 @@
-# Template file for 'llvm9'.
+# Template file for 'llvm9'
 pkgname=llvm9
 version=9.0.1
 revision=5
@@ -57,10 +57,6 @@ if [ "$_lldb_enable" = "yes" ]; then
 fi
 subpackages+=" lld lld-devel"
 
-case "$XBPS_TARGET_MACHINE" in
-	armv5*) broken="Tries to assemble VFP instructions with armv5tel arch";;
-esac
-
 post_patch() {
 	# patches
 	cd ${XBPS_BUILDDIR}/llvm-${version}.src
@@ -75,6 +71,16 @@ post_patch() {
 		patch -sNp1 -i ${i}
 	done
 
+	case "$XBPS_TARGET_MACHINE" in
+	armv5*)
+		cd ${XBPS_BUILDDIR}/compiler-rt-${version}.src
+		for i in ${FILESDIR}/patches/compiler-rt/compiler-rt-*.patch; do
+			msg_normal "Applying $i to compiler-rt\n"
+			patch -sNp1 -i ${i}
+		done
+		;;
+	esac
+
 	if [ "$_lldb_enable" = "yes" ]; then
 		cd ${XBPS_BUILDDIR}/lldb-${version}.src
 		for i in ${FILESDIR}/patches/lldb/*.patch; do