Merge version 1:13.0.1-7+rpi1 and 1:13.0.1-9 to produce 1:13.0.1-9+rpi1

diff --cc debian/changelog
index 3c6a793986d55df07764a64cc7d8daa2d7209d37,f85c82897c5862d8994401cd9ec49afdacee50cd..aabede26a325f75a039a40fc74ce7544c1c166db
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,49 -1,31 +1,78 @@@
- llvm-toolchain-13 (1:13.0.1-7+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-13 (1:13.0.1-9+rpi1) bookworm-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, 06 Aug 2022 08:51:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 29 Nov 2022 14:57:58 +0000
++
+ llvm-toolchain-13 (1:13.0.1-9) unstable; urgency=medium
+ 
+   * Fix the lldb swig issues (closes: #1023466)
+ 
+   [ Jordan Justen ]
+   * d/rules: Don't send an empty string to cmake when llvm-spirv is not found
+   * d/rules: Check for llvm-spirv-14 first, and then llvm-spirv
+   * d/control: Add llvm-spirv-14 as the first build dep option
+     (Closes: #1022295)
+   * d/rules: Run sed to include .spv files if LLVM_SPIRV is defined
+   * d/rules: Don't check package version of llvm-spirv-14
+ 
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 05 Nov 2022 09:14:23 +0100
+ 
+ llvm-toolchain-13 (1:13.0.1-8) unstable; urgency=medium
+ 
+   [ Sylvestre Ledru ]
+   * Disable the build of libclc on old Ubuntu (Groovy & focal)
+     as llvm-spir is too old on these version.
+     See bug #52200
+ 
+   [ Jordan Justen ]
+   * d/rules: Call bash to use 'command -v' to location llvm-spirv executable
+   * d/rules: Set LLVM_SPIRV with cmake for libclc
+   * d/patches: Drop libclc-llvm-spirv.diff now that we are setting LLVM_SPIRV
+   * d/rules: Check for llvm-spirv with version suffix
+ 
+  -- Jordan Justen <jljusten@debian.org>  Wed, 26 Oct 2022 10:13:59 -0700
  
  llvm-toolchain-13 (1:13.0.1-7) unstable; urgency=medium
  

diff --cc debian/control
index 7a4482cf12554e624998cc3c33b7ae0a5d228ab8,9af8137c5dc015d9b6dc58f365f972bc2d0b1f3a..6d51d6bd385e87e737ad37fe323a683ef28a278f
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -18,10 -18,13 +18,12 @@@ Build-Depends: debhelper (>= 10.0), cma
      libjs-mathjax, python3-recommonmark,
      doxygen, gfortran,
      ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 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],
 +    ocaml-findlib [amd64 arm64 armhf ppc64el s390x],
 +    libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x],
 +    dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x],
      libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
 -    spirv-tools [ linux-any ] | hello [ !i386],
+     llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> |
+     llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
      libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
      protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
      libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],

diff --cc debian/patches/series
index 301536d6578d12e333c751e0a9cb15e7ad46f965,b35cec87ce6735ea742fd583f4ebf72a4107b4a8..62bd62c2e76e22933066589b1406baaf2fb995b6
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -112,7 -137,7 +112,6 @@@ libcxx-armhf-ftbfs.dif
  lower-python-dep.diff
  scan-build-py-fix-analyze-path.diff
  scan-build-py-fix-default-bin.diff
- libclc-llvm-spirv.diff
 -
  omp-riscv64.patch
  test-disable-lldb-i386.diff
  unbreak-atomic-mips.diff
@@@ -133,4 -159,5 +132,6 @@@ fix-merge-MergeFunctions-scheduling.dif
  llvm-objcopy-COFF-Consider-section-flags-when-adding.patch
  yaml2obj-COFF-Allow-variable-number-of-directories.patch
  llvm-objcopy-COFF-Fix-test-for-debug-dir-presence.patch
+ lldb/lldb-swig-2.diff
+ lldb/lldb-swig.diff
 +raspbian-triplet.patch

diff --cc debian/rules
Simple merge