Merge version 9.4.7-2+rpi1 and 9.6.6-2 to produce 9.6.6-2+rpi1

diff --cc debian/changelog
index 31eda797a4361d1a694adf410674db39a09b1107,6e511abc309baada49738c1bad6d4eddd9ade979..5dba5af4143facf5b98b16827895e7bc88dfe404
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,136 +1,152 @@@
- ghc (9.4.7-2+rpi1) trixie-staging; urgency=medium
++ghc (9.6.6-2+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 7.6.3-21+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 19 Apr 2015 14:00:16 +0000]
 +  * Change compiler defaults for armv6
 +
 +  [changes brought forward from 9.0.2-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 04 Oct 2022 05:00:41 +0000]
 +  * Add build-conflicts on libllvm14
 +
 +  [changes brought forward from 9.0.2-4+rpi3 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Oct 2022 13:33:13 +0000]
 +  * Add build conflicts on libnuma1
 +
 +  [changes introduced in 9.4.7-2+rpi1 by Peter Michael Green]
 +  * replace dmb instruction with coprocessor barrier instruction.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Dec 2023 05:25:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 02 Nov 2024 06:04:23 +0000
++
+ ghc (9.6.6-2) unstable; urgency=medium
+ 
+   * Update 'hadrian-enable-interpreter' patch to re-enable GHCi
+     on all architectures (Closes: #1081883)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 16 Sep 2024 00:17:25 +0300
+ 
+ ghc (9.6.6-1) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * Declare compliance with Debian policy 4.7.0
+   * Use libnuma-dev only on architectures where it's available
+   * Don't run tests on crossbuild (Closes: #1081069)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Wed, 11 Sep 2024 15:16:54 +0300
+ 
+ ghc (9.6.6-1~exp5) experimental; urgency=medium
+ 
+   * Use gold on arm{el,hf}
+   * Drop redundant build-dep on devscripts
+   * Add missing build-dep on libnuma-dev
+   * Add missing dependency on libstdc++-X-dev library
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 26 Aug 2024 17:37:05 +0300
+ 
+ ghc (9.6.6-1~exp4) experimental; urgency=medium
+ 
+   * Bump hadrian dependency
+   * Bump required LLVM version to 18
+   * Backport upstream patch to fix incorrect use of word-sized types on
+     32-bit systems
+   * Use system's default linker (bfd) instead of gold (Closes: #1079099)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Mon, 26 Aug 2024 11:31:53 +0300
+ 
+ ghc (9.6.6-1~exp3) experimental; urgency=medium
+ 
+   [ Peng Fan <fanpeng@loongson.cn> ]
+   * Add loong64 support (Closes: #1071151)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 13 Aug 2024 14:17:49 +0200
+ 
+ ghc (9.6.6-1~exp2) experimental; urgency=medium
+ 
+   * Set llvm-version back to 17, FBTFS
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 17 Jul 2024 08:51:18 +0200
+ 
+ ghc (9.6.6-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 15 Jul 2024 14:17:29 +0200
+ 
+ ghc (9.6.5-1~exp2) experimental; urgency=medium
+ 
+   [ John Paul Adrian Glaubitz ]
+   * Pass --disable-ld-override in EXTRA_INSTALL_CONFIGURE_FLAGS
+     (Closes: #1073159)
+ 
+   [ Gianfranco Costamagna ]
+   * Bump required llvm-version to 18
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 15 Jul 2024 13:58:17 +0200
+ 
+ ghc (9.6.5-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Backport patch to use newer LLVM versions
+   * Use LLVM 17
+   * Build registerised on loong64
+   * Add hadrian bootstrap plan for GHC v9.6.5
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Fri, 03 May 2024 10:15:54 +0300
+ 
+ ghc (9.6.4-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * Build unregisterised on loong64 since llvm-15 is not available
+   * Build unregisterised on powerpc (Closes: #1060196)
+   * Do not error out when cross building, let it fail instead
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Sat, 13 Jan 2024 16:22:36 +0200
+ 
+ ghc (9.6.3-1~exp2) experimental; urgency=medium
+ 
+   * Backport upstream patch to fix build on armel/armhf
+   * Depend on LLVM for loong64
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Tue, 26 Dec 2023 10:08:47 +0200
+ 
+ ghc (9.6.3-1~exp1) experimental; urgency=medium
+ 
+   [ Gianfranco Costamagna ]
+   * New upstream release (Closes: #1053588)
+   * drop patches now upstream
+     - newer-llvm
+     - fix-cross-compilation
+     - fix-hs_cmpxchg64
+     - fix-32-bit-unreg
+ 
+   [ Ilias Tsitsimpis ]
+   * Backport upstream fixes
+   * Bump hadrian dependency
+   * Patch Cabal and add support for sparc64.
+     Thanks to John Paul Adrian Glaubitz for the fix (Closes: #1056033).
+   * Add support for hurd-i386.
+     Thanks to Samuel Thibault for the fix (Closes: #1056305).
+   * Update d/rules to work with newer version
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Thu, 21 Dec 2023 09:21:59 +0200
+ 
+ ghc (9.4.7-5) unstable; urgency=medium
+ 
+   * Backport upstream patches to fix issues with 64-bit time_t (Closes:
+     #1068586)
+   * Build unregisterised on powerpc (Closes: #1060196)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Wed, 10 Apr 2024 14:24:01 +0300
+ 
+ ghc (9.4.7-4) unstable; urgency=medium
+ 
+   * Backport upstream patch to fix compilation with GCC 14 (Closes: #1068179)
+ 
+  -- Ilias Tsitsimpis <iliastsi@debian.org>  Sat, 06 Apr 2024 10:34:53 +0300
+ 
+ ghc (9.4.7-3) unstable; urgency=medium
+ 
+   * debian/patches/dfe1c3540e4b519b62b862b5966dfec5cae9ece1.patch:
+     - cherry-pick upstream fix for misaligned objects in the data section with
+       llvm-based builds. (LP: #2052696)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 19 Feb 2024 17:12:25 +0100
  
  ghc (9.4.7-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 6e6c8886f1dd4ad3065a5e0a8fc07deb064666d7,101cec61bb1a91ac484c5e26925a99ec75df4f4d..707c40df8d680f10b748dd2689c56c872f143071
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -19,7 -16,14 +16,15 @@@ hadrian-disable-threade
  hadrian-enable-interpreter
  use-modern-atomics
  ppc64el-fix-clrri
+ sparc64-cabal-support
+ hurd-cabal-osstring
+ hurd-cabal-supportrpaths
+ hurd-getExecutablePath
+ hurd-hadrian-osstring
+ hurd-hadrian-supportrpaths
+ time_t-time
+ llvm-new-pass-manager
+ llvm-newer-version
+ hadrian-plans
+ pr-13096
 +replace-dmb-instruction-with-coprocessor.patch

diff --cc rts/include/stg/SMP.h
index 76ed1805019c0e9ad081d505f6e03f78503e8624,bb30935aed57764b36c2a6040942840a4e838526..bcf05e1fc4793f5a52303c811c8419e69d08c73d
--- 1/rts/include/stg/SMP.h
--- 2/rts/include/stg/SMP.h
+++ b/rts/include/stg/SMP.h
@@@ -409,9 -487,11 +487,11 @@@ write_barrier(void) 
  #elif defined(s390x_HOST_ARCH)
      __asm__ __volatile__ ("" : : : "memory");
  #elif defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)
 -    __asm__ __volatile__ ("dmb  st" : : : "memory");
 +    __asm__ __volatile__ ("mcr p15, #0, r0, c7, c10, #5" : : : "memory");
  #elif defined(riscv64_HOST_ARCH)
      __asm__ __volatile__ ("fence w,w" : : : "memory");
+ #elif defined(loongarch64_HOST_ARCH)
+     __asm__ __volatile__ ("dbar 0" : : : "memory");
  #else
  #error memory barriers unimplemented on this architecture
  #endif