Merge version 1:17.0.6-20+rpi1 and 1:17.0.6-21 to produce 1:17.0.6-21+rpi1

diff --cc debian/changelog
index a070e5fc39bd0cd8aa5367d13b2ed6fe7e99a1f8,96f916ac11c3a187e8d2514917fdb54b3f041a47..ee1735be5f56bf21609ffb1c81042d3348494b8b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,9 +1,56 @@@
- llvm-toolchain-17 (1:17.0.6-20+rpi1) trixie-staging; urgency=medium
++llvm-toolchain-17 (1:17.0.6-21+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [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.
 +
 +  [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green]
 +  * Disable scudo on armhf, it needs atomics which we do not want to enable.
 +
 +  [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Nov 2021 22:37:30 +0000]
 +  * Remove armhf from architecture list for libunwind-13-dev dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Feb 2025 00:43:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 15 Feb 2025 00:27:22 +0000
++
+ llvm-toolchain-17 (1:17.0.6-21) unstable; urgency=medium
+ 
+   * d/t/control: Remove explicit dependency on libstdc++-N-dev.
+   * d/control, d/t/control: Add binutils-gold as explicit build dependency.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 07 Feb 2025 10:17:16 +0100
  
  llvm-toolchain-17 (1:17.0.6-20) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/control.in
Simple merge