From ddc988a1aef5a8eb477dcd86798ef306e43542a2 Mon Sep 17 00:00:00 2001
From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 28 Sep 2023 03:28:01 +0000
Subject: [PATCH] remove armhf from libunwind architecture lists.

---
 debian/control    | 12 ++++++------
 debian/control.in |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 2a4447b61e..7eec2fbefa 100644
--- a/debian/control
+++ b/debian/control
@@ -19,9 +19,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libjs-mathjax, python3-recommonmark,
     doxygen,
     ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],
-    ocaml-findlib [amd64 arm64 armhf ppc64el s390x],
-    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
-    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
+    ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x],
+    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
+    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
     llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
@@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
     protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
 # "| hello" is for older buster/bionic distros without spirv support
-Build-Conflicts: oprofile, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
+Build-Conflicts: oprofile
 Standards-Version: 4.6.2
 Homepage: https://www.llvm.org/
 Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 16
@@ -688,7 +688,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends},
- libunwind-16-dev [amd64 arm64 i386 ppc64el ppc64 riscv64]
+ libunwind-16-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -828,7 +828,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-16
 Section: libs
-Architecture: amd64 arm64 i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
diff --git a/debian/control.in b/debian/control.in
index 6df959fa27..729e4ba42a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -828,7 +828,7 @@ Description: OpenCL C language implementation - development files
 
 Package: libunwind-@LLVM_VERSION@
 Section: libs
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 i386 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -845,7 +845,7 @@ Description: production-quality unwinder
 
 Package: libunwind-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64
+Architecture: amd64 arm64 i386 ppc64el ppc64 riscv64
 Multi-Arch: same
 Depends:
  ${misc:Depends},
-- 
2.30.2