compiler-rt: backport a patch fixing ARMv5 cross-compile

Compiler-rt cross-compile for ARMv5 fails because D99282 made it an error if DMB
is used for any pre-ARMv6 targets. More specifically, the "#error only supported
on ARMv6+" added in D99282 will cause compilation to fail when any source file
which includes assembly.h are compiled for pre-ARMv6 targets. Since the only
place where DMB is used is syn-ops.h (which is only included by
arm/sync_fetch_and_* and these files are excluded from being built for older
targets), this patch moves the definition there to avoid the issues described
above.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
(cherry picked from commit 36c4dc63c96fb0962d3825c19b22a166db0f3e4f)

2 files changed, 66 insertions, 0 deletions

diff --git a/recipes-devtools/clang/clang/0036-compiler-rt-builtins-Move-DMB-definition-to-syn-opsh.patch b/recipes-devtools/clang/clang/0036-compiler-rt-builtins-Move-DMB-definition-to-syn-opsh.patch
new file mode 100644
index 0000000..3616645
--- /dev/null
+++ b/recipes-devtools/clang/clang/0036-compiler-rt-builtins-Move-DMB-definition-to-syn-opsh.patch
@@ -0,0 +1,65 @@
+From 1c9415806ba6d0d48a160637eea7d1b70efaae69 Mon Sep 17 00:00:00 2001
+From: Pengxuan Zheng <pzheng@quicinc.com>
+Date: Mon, 4 Apr 2022 18:17:03 -0700
+Subject: [PATCH] [compiler-rt][builtins] Move DMB definition to syn-ops.h
+
+Upstream-Status: Backported
+
+Compiler-rt cross-compile for ARMv5 fails because D99282 made it an error if DMB
+is used for any pre-ARMv6 targets. More specifically, the "#error only supported
+on ARMv6+" added in D99282 will cause compilation to fail when any source file
+which includes assembly.h are compiled for pre-ARMv6 targets. Since the only
+place where DMB is used is syn-ops.h (which is only included by
+arm/sync_fetch_and_* and these files are excluded from being built for older
+targets), this patch moves the definition there to avoid the issues described
+above.
+
+Reviewed By: efriedma
+
+Differential Revision: https://reviews.llvm.org/D123105
+---
+ compiler-rt/lib/builtins/arm/sync-ops.h | 8 ++++++++
+ compiler-rt/lib/builtins/assembly.h     | 8 --------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/compiler-rt/lib/builtins/arm/sync-ops.h b/compiler-rt/lib/builtins/arm/sync-ops.h
+index d914f9d3a109..dca201d8aef7 100644
+--- a/compiler-rt/lib/builtins/arm/sync-ops.h
++++ b/compiler-rt/lib/builtins/arm/sync-ops.h
+@@ -14,6 +14,14 @@
+ 
+ #include "../assembly.h"
+ 
++#if __ARM_ARCH >= 7
++#define DMB dmb
++#elif __ARM_ARCH >= 6
++#define DMB mcr p15, #0, r0, c7, c10, #5
++#else
++#error DMB is only supported on ARMv6+
++#endif
++
+ #define SYNC_OP_4(op)                                                          \
+   .p2align 2;                                                                  \
+   .syntax unified;                                                             \
+diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h
+index 06aa18162e3b..69a3d8620f92 100644
+--- a/compiler-rt/lib/builtins/assembly.h
++++ b/compiler-rt/lib/builtins/assembly.h
+@@ -189,14 +189,6 @@
+   JMP(ip)
+ #endif
+ 
+-#if __ARM_ARCH >= 7
+-#define DMB dmb
+-#elif __ARM_ARCH >= 6
+-#define DMB mcr p15, #0, r0, c7, c10, #5
+-#else
+-#error Only use this with ARMv6+
+-#endif
+-
+ #if defined(USE_THUMB_2)
+ #define WIDE(op) op.w
+ #else
+-- 
+2.25.1
+
diff --git a/recipes-devtools/clang/common.inc b/recipes-devtools/clang/common.inc
index b61d239..7cbd7f4 100644
--- a/recipes-devtools/clang/common.inc
+++ b/recipes-devtools/clang/common.inc
@@ -45,6 +45,7 @@ SRC_URI = "\
     file://0033-lldb-Link-with-libatomic-on-x86.patch \
     file://0034-clang-exclude-openembedded-distributions-from-settin.patch \
     file://0035-compiler-rt-Enable-__int128-for-ppc32.patch \
+    file://0036-compiler-rt-builtins-Move-DMB-definition-to-syn-opsh.patch \
     "
 # Fallback to no-PIE if not set
 GCCPIE ??= ""