Manual merge of version 1.85.0+dfsg3-1+rpi1 and 1.91.1+dfsg1-1 to produce 1.91.1...

diff --cc debian/changelog
index 01c6037de95979fa87222d6ec72e475d49dcb649,7d7773b4ada808eeb062d29ba489fd9def76de82..d6f8e4feabc8b3e6714bbd278e0c860efd0ff77e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,147 +1,162 @@@
- rustc (1.85.0+dfsg3-1+rpi1) trixie-staging; urgency=medium
++rustc (1.91.1+dfsg1-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +  [changes introduced in 1.42.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE
 +  [changes introduced in 1.57.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite for arch all builds as well.
-   [changes introduced in 1.85.0+dfsg2-2+rpi1 by Peter Michael Green]
-   * Cherry pick upstream fixes for documentation build on arm32.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 05 May 2025 20:21:05 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 22 Jan 2026 06:04:58 +0000
++
+ rustc (1.91.1+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Fri, 26 Dec 2025 20:54:51 +0100
+ 
+ rustc (1.91.1+dfsg1-1~exp3) experimental; urgency=medium
+ 
+   * build: skip compiler-rt on x32
+   * hurd: enable flock support
+   * build: bypass bootstrap lock on hurd
+   * rules: fix dh_auto_clean if no extra vendor tarball exists
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 16 Dec 2025 13:00:29 +0100
+ 
+ rustc (1.91.1+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * config: fix optimized-compiler-rt on sparc64/hurd
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Mon, 15 Dec 2025 15:21:33 +0100
+ 
+ rustc (1.91.1+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * upgrade to LLVM 21
+   * regenerate wit-bindgen object files
+   * config: set LLVM compiler-rt as optimized-compiler-builtins
+   * build: add bpfel/bpfeb stdlib package
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Fri, 12 Dec 2025 15:37:41 +0100
+ 
+ rustc (1.90.0+dfsg1-1) unstable; urgency=medium
+ 
+   * rust-src: add lintian override for jquery copy in benchmark input
+   * d/control: let rust-analyzer recommends rust-src (Closes: #1117559)
+   * fix loongarch64 build
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Sat, 25 Oct 2025 10:07:56 +0200
+ 
+ rustc (1.90.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * loongarch: fix std_detect with LLVM 19
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Thu, 16 Oct 2025 11:20:34 +0200
+ 
+ rustc (1.89.0+dfsg1-1) unstable; urgency=medium
+ 
+   * cherry-pick f32/f64::{min,max}imum fallback
+   * loongarch: fix C function ABI wrt floats
+   * d/rules: count failed test invocations as test failures (again)
+   * x32: set panic strategy to abort
+   * x32: skip test suite analysis
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Mon, 13 Oct 2025 15:19:45 +0200
+ 
+ rustc (1.89.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * update config.toml.in
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Fri, 10 Oct 2025 11:57:40 +0200
+ 
+ rustc (1.88.0+dfsg1-2) unstable; urgency=medium
+ 
+   * add lld-19 to Build-Depends-Indep
+   * fix cargo-doc references in rust-doc
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Fri, 03 Oct 2025 10:19:57 +0200
+ 
+ rustc (1.88.0+dfsg1-1) unstable; urgency=medium
+ 
+   * cherry-pick libc fix for hurd
+   * loongarch64: fix typo in patch disabling f16
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 30 Sep 2025 08:45:39 +0200
+ 
+ rustc (1.88.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * fix or disable more broken tests
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Thu, 25 Sep 2025 10:36:50 +0200
+ 
+ rustc (1.87.0+dfsg1-1) unstable; urgency=medium
+ 
+   * revert changes requiring LLVM >=20 (fix loongarch64/mips64el)
+   * fix more broken tests
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Sat, 20 Sep 2025 16:00:58 +0200
+ 
+ rustc (1.87.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * cherry-pick fix for PROFILER_RT linking
+   * fix some broken tests
+   * config: update to 1.87.0 change-id
+   * d/control: correctly pull in liblzma-dev
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 09 Sep 2025 21:23:03 +0200
+ 
+ rustc (1.86.0+dfsg1-1) unstable; urgency=medium
+ 
+   * upload to unstable
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Sun, 10 Aug 2025 10:56:06 +0200
+ 
+ rustc (1.86.0+dfsg1-1~exp4) experimental; urgency=medium
+ 
+   * ppc64: downgrade baseline to Power4+ (Closes: #1110059)
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Mon, 04 Aug 2025 18:03:21 +0200
+ 
+ rustc (1.86.0+dfsg1-1~exp3) experimental; urgency=medium
+ 
+   * fix bswap codegen test broken on some 64-bit architectures
+   * fix x32 bootstrap (Closes: #1109669)
+   * d/rules: allow ~exp version and 'unreleased' distribution
+   * d/copyright: update FSF address
+   * cargo wrapper: support 'terse' DEB_BUILD_OPTION (Closes: #1103509)
+   * d/rules: properly cleanup after build (Closes: #1048141)
+   * d/rules: don't configure twice in arch+indep build
+   * d/rules: replace libzlma-sys hack with patch
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 22 Jul 2025 22:20:24 +0200
+ 
+ rustc (1.86.0+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * install: drop generated copyright/licenses
+   * build: move non-release archs to highest test fail category
+   * fix another broken test
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 03 Jun 2025 13:05:55 +0200
+ 
+ rustc (1.86.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release
+   * config: set ninja and lld to false
+   * patches: re-add accidentally dropped hunk of gitoxide patch
+   * mdbook: cherry-pick upstream fix for error-index book
+   * prune: also prune input list for generating copyright information
+   * rust-docs: install upstream copyright and license files
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 13 May 2025 10:11:12 +0200
  
  rustc (1.85.0+dfsg3-1) unstable; urgency=medium
  

diff --cc debian/rules
index 8d0ef5eca5861af41c907b264fd76b642ef8a052,74a616699ab2ce5b284a1aa01c235c34a758d57d..4dcc11ea4593b9ac115743def140e84071903a23
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -366,8 -403,11 +403,11 @@@ override_dh_auto_test-arch
                test "$$(stat -c %s "$$x")" -lt 6000000; \
        done
  ifeq (, $(filter nocheck,$(DEB_BUILD_PROFILES)))
 -ifeq (, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
 +ifeq (testsuitedisabled, $(filter nocheck,$(DEB_BUILD_OPTIONS)))
-       { $(RUSTBUILD_TEST) $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS); echo $$?; } | tee -a $(TEST_LOG)
+       { $(RUSTBUILD_TEST) $(RUSTBUILD_FLAGS) $(RUSTBUILD_TEST_FLAGS) 2>&1; echo $$?; } | tee -a $(TEST_LOG)
+ ifneq (,$(filter $(DEB_BUILD_ARCH), x32))
+       echo "Skipping test suite analysis on x32.."
+ else
        # test that the log has at least 1 pass, to prevent e.g. #57709
        grep -l "^test .* \.\.\. ok$$" $(TEST_LOG)
        echo "==== Debian rustc test report ===="; \