Disable use of llvm libunwind on armhf, it seems to come out armv7 contaminated.

diff --git a/debian/changelog b/debian/changelog
index 125174469e31d131bfdc36e8817efef5d432ad97..6ee347ac302018472f2712fd5b917665cc37e73b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,9 @@ llvm-toolchain-12 (1:12.0.1-16+rpi1) bullseye-staging; urgency=medium
   [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
   * Change triplet in debian/rules to use armv6k rather than armv7l
 
+  [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.
+
  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 23 Jan 2021 14:24:45 +0000
 
 llvm-toolchain-12 (1:12.0.1-16) unstable; urgency=medium

diff --git a/debian/control b/debian/control
index 9d62f1d31ca5f739d4198461a4412d107603d8fd..c0d8ea4fa195f46c62682c717af197dab254f071 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -721,7 +721,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-12
 Section: libs
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 i386 mips64el ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -738,7 +738,7 @@ Description: production-quality unwinder
 
 Package: libunwind-12-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+Architecture: amd64 arm64 i386 mips64el ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},

diff --git a/debian/rules b/debian/rules
index f454bbbdaeb2d8e5f18288af5f5956093fe313c4..8555c3f0be5f4c0aaaeda0b42d343100d4c395d3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -233,7 +233,7 @@ endif
 
 # Enable libunwind (or not)
 LIBUNWIND_ENABLE=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel mipsel hurd-i386 powerpc sparc sparc64 x32))
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel armhf mipsel hurd-i386 powerpc sparc sparc64 x32))
   LIBUNWIND_ENABLE=no
 # do not use compiler-rt builtins for libcxx (libcxxabi) when libunwind is
 # disabled since the gnu implementation in libgcc_s will then be required