Disable scudo on armhf, it needs atomics which we do not want to enable.

diff --git a/debian/changelog b/debian/changelog
index 6d4c26cbc74d28a29ba19e9193aaa917a21ff76a..51d2ab73d8099e46ccad61d71591718ba21639ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,9 @@ llvm-toolchain-13 (1:13.0.0-9+rpi1) bookworm-staging; urgency=medium
   [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green]
   * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated.
 
+  [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
+  * Disable scudo on armhf, it needs atomics which we do not want to enable.
+
  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 17 Nov 2021 04:09:35 +0000
 
 llvm-toolchain-13 (1:13.0.0-9) unstable; urgency=medium

diff --git a/debian/rules b/debian/rules
index 72d45671ffa1dd9a74b5b4465e46be9565301520..868b5591903b13f41aa779302ca3b4f2cb796d01 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,10 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
   COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
   LIBCXX_USE_COMPILER_RT := OFF
+# disable scudo standalone (not supported for baseline armel arch: armv6)
+# note: we don't build with "k" in raspbian even though the CPU supports
+# it because armv6k atomics have forward-compatibility problems.
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_SCUDO_STANDALONE=OFF
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),i386))