From 7595db38bd56efd89493c033bfb44a8da3664339 Mon Sep 17 00:00:00 2001
From: Matthias Klose <doko@ubuntu.com>
Date: Tue, 3 Sep 2024 15:01:44 +0200
Subject: [PATCH]   * Add hurd-amd64 support.

---
 debian/changelog | 4 ++++
 debian/control   | 4 ++--
 debian/rules     | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6e8ffa9..dd4c8ff7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Also explicitly link with -latomic on mips64el.
   * Disable openmp on loong64 (ld: cannot find -lomptarget.rtl.host).
   * Build without z3 on sh4 (ftbfs).
@@ -7,6 +8,9 @@ llvm-toolchain-19 (1:19.1.0~++rc3-3) UNRELEASED; urgency=medium
   * debian/tests/*: s/18/19/.
   * debian/qualify-clang.sh: Don't check for libclang-cpp.so.$VERSION symlink.
 
+  [ Samuel Thibault ]
+  * Add hurd-amd64 support.
+
  -- Matthias Klose <doko@debian.org>  Sat, 31 Aug 2024 20:22:25 +0200
 
 llvm-toolchain-19 (1:19.1.0~++rc3-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4328d1e2..ce250421 100644
--- a/debian/control
+++ b/debian/control
@@ -625,7 +625,7 @@ Description: Next generation, high-performance debugger, header files
 
 Package: libomp-19-dev
 Section: libdevel
-Architecture: amd64 arm64 armhf ppc64 ppc64el
+Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64
 Depends: libomp5-19 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: libomp-19-doc
 Breaks: libiomp-dev (<< 3.7-1)
@@ -639,7 +639,7 @@ Description: LLVM OpenMP runtime - dev package
 
 Package: libomp5-19
 Multi-Arch: same
-Architecture: amd64 arm64 armhf ppc64 ppc64el
+Architecture: amd64 arm64 armhf ppc64 ppc64el hurd-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: ${t64:Provides}, libomp-x.y
 Conflicts: libomp-x.y
diff --git a/debian/rules b/debian/rules
index d16fca4b..6052829b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -348,7 +348,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes)
 	LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV)
 endif
 
-BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
+BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 hurd-amd64 kfreebsd-amd64 kfreebsd-i386
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
 ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 	STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold
@@ -396,7 +396,7 @@ endif
 
 # Enable libunwind (or not)
 LIBUNWIND_ENABLE=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel mips64el hurd-i386 powerpc sparc sparc64 x32))
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel mips64el hurd-i386 hurd-amd64 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
@@ -409,7 +409,7 @@ else
 endif
 
 # Enable openmp (or not)
-OMP_ARCHS = amd64 arm64 armhf ppc64 ppc64el
+OMP_ARCHS = amd64 arm64 armhf ppc64 ppc64el hurd-amd64
 OPENMP_ENABLE=yes
 ifeq (,$(filter $(DEB_HOST_ARCH), $(OMP_ARCHS)))
   OPENMP_ENABLE=no
@@ -474,7 +474,7 @@ else
 endif
 
 LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel
+LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel
 # hurd has threading issues
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.