Merge tag '1%14.0.6-2+rpi1' of 172.17.3.10:/build/git/l/llvm-toolchain-14 into bookwo...

diff --cc compiler-rt/cmake/base-config-ix.cmake
index 8a6219568b3f454dc8756bf605414d9b15c09d22,980aa2d3407e8747b6f6a5a9bf697f2aa182f60d..dcd62be5f31841a2eb4236cb33d870949ebdb083
--- 1/compiler-rt/cmake/base-config-ix.cmake
--- 2/compiler-rt/cmake/base-config-ix.cmake
+++ b/compiler-rt/cmake/base-config-ix.cmake
@@@ -230,12 -227,10 +230,12 @@@ macro(test_targets
        if(WIN32)
          test_target_arch(arm "" "" "")
        else()
-         test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
-         test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
+         test_target_arch(arm "" "" "-mfloat-abi=soft")
+         test_target_arch(armhf "" "" "-mfloat-abi=hard")
          test_target_arch(armv6m "" "-march=armv6m" "-mfloat-abi=soft")
        endif()
 +    elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "avr")
 +      test_target_arch(avr "__AVR__" "--target=avr")
      elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
        test_target_arch(aarch32 "" "-march=armv8-a")
      elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")

diff --cc debian/changelog
index ce681e79867a427079b74913adcf5df902502e5c,a5c1fcd1b91fd17c3c025cd2238d03606fba59da..901044699bcea6c917e0f0828e01b8e5e6649c9d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,337 -1,49 +1,384 @@@
 -llvm-toolchain-14 (1:14.0.6-2+rpi1) bookworm-staging; urgency=medium
++llvm-toolchain-15 (1:15.0.5-3+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, 30 Jul 2022 04:23:14 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 26 Nov 2022 18:48:42 +0000
++
 +llvm-toolchain-15 (1:15.0.5-3) unstable; urgency=medium
 +
 +  * Depend again on spirv-15 for mips64el.
 +
 + -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 20 Nov 2022 06:54:23 +0100
 +
 +llvm-toolchain-15 (1:15.0.5-2) unstable; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * Add libomp target library to mips64el (Closes: #1023101)
 +  * Explictly depend on spirv-14 for mips64el, to ease bootstrapping
 +    on buildds (this should be dropped once we build a spirv-15 in archive)
 +  * Cherry-pick two upstream patches to unblock mesa build on arm* (Closes:
 +    #1022577)
 +
 +  [ Sylvestre Ledru ]
 +  * store the sccache results in /tmp/buildd/source/sccache-stats.json
 +
 + -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 19 Nov 2022 23:25:04 +0100
 +
 +llvm-toolchain-15 (1:15.0.5-1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * Remove the swig patches (applied upstream)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 16 Nov 2022 09:11:01 +0100
 +
 +llvm-toolchain-15 (1:15.0.4-1) unstable; urgency=medium
 +
 +  [ Jordan Justen ]
 +  * d/rules: Rename LLVM_SPIR_VERSION to LLVM_SPIRV_VERSION
 +  * d/rules: Call bash to use 'command -v' to locate llvm-spirv executable
 +  * debian: Bump llvm-spirv to 15 to match the llvm version
 +  * 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: Restore building libclc .bc output without spir-v support
 +  * d/rules: Check for previous version of llvm-spirv as well
 +  * d/control: Add llvm-spirv-14 as an alternative to llvm-spirv-15
 +
 +  [ Sylvestre Ledru ]
 +  * New upstream release (Closes: #1023455)
 +  * Cherry-pick patches to fix the FTBFS with swig + lldb (Closes: #1023444)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 02 Nov 2022 08:50:23 +0100
 +
 +llvm-toolchain-15 (1:15.0.3-2) unstable; urgency=medium
 +
 +  * Cherry-pick upstream fix to unbreak mips (closes: #1022169)
 +    Thanks to YunQiang Su for the patch
 +    https://reviews.llvm.org/D135553
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 28 Oct 2022 10:25:45 +0200
 +
 +llvm-toolchain-15 (1:15.0.3-1) unstable; urgency=medium
 +
 +  * Upload to unstable now that autopkgtest is green
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 23 Oct 2022 10:34:58 +0200
 +
 +llvm-toolchain-15 (1:15.0.3-1~exp2) experimental; urgency=medium
 +
 +  * Fix autopkgtest (remove move stuff from the cmake search)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 21 Oct 2022 23:53:23 +0200
 +
 +llvm-toolchain-15 (1:15.0.3-1~exp1) experimental; urgency=medium
 +
 +  * New stable release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 18 Oct 2022 14:04:32 +0200
 +
 +llvm-toolchain-15 (1:15.0.2-2~exp6) experimental; urgency=medium
 +
 +  * Disable LTO for now
 +  * don't search for llvm-bolt, merge-fdata, etc in cmake
 +    https://github.com/llvm/llvm-project/issues/58317
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 12 Oct 2022 16:19:03 +0200
 +
 +llvm-toolchain-15 (1:15.0.2-2~exp5) experimental; urgency=medium
 +
 +  * Only enable LTO for some archs
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 11 Oct 2022 09:15:56 +0200
 +
 +llvm-toolchain-15 (1:15.0.2-2~exp4) experimental; urgency=medium
 +
 +  * Only ship libbolt_rt_hugify.a & libbolt_rt_instr.a on amd64
 +  * fix the cmake detection with libmlir
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 09 Oct 2022 20:09:46 +0200
 +
 +llvm-toolchain-15 (1:15.0.2-2~exp3) experimental; urgency=medium
 +
 +  * Build using LTO - better performances of the llvm-toolchain
 +    binaires
 +  * Build libfuzzer with C++ 17 ot unbreak it
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 08 Oct 2022 15:06:37 +0200
 +
 +llvm-toolchain-15 (1:15.0.2-2~exp2) experimental; urgency=medium
 +
 +  * Fix a typo to silent lintian (Closes: #1018770)
 +  * Fix some hardcoded paths (Closes: #1020847)
 +  * Suggest wasi-libc for clang
 +
 +  [ Witold Baryluk ]
 +  * Allow libunwind-dev to be coinstallable (Closes: #1004112)
 +
 +  [ Faidon Liambotis ]
 +  * Add better support for the WebAssembly (wasm32/wasm64) targets:
 +    - Ship compiler-rt for the wasm32 and wasm64 targets. (Closes: #1010932)
 +    - Add patch wasm-compiler-rt-default.diff to default to compiler-rt for
 +      these targets. libgcc does not currently exist for WebAssembly in neither
 +      Debian nor upstream, and therefore compiler-rt is the only option.
 +    - Add patch wasm-sysroot-usr.diff to support a system-installed (i.e. shipped
 +      in /usr) wasi-libc. (Closes: #1020746)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 06 Oct 2022 17:04:24 +0200
 +
 +llvm-toolchain-15 (1:15.0.2-2~exp1) experimental; urgency=medium
 +
 +  * Ship bolt
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 04 Oct 2022 15:21:19 +0200
 +
 +llvm-toolchain-15 (1:15.0.2-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 04 Oct 2022 12:46:25 +0200
 +
 +llvm-toolchain-15 (1:15.0.1-1) unstable; urgency=medium
 +
 +  * Upload to unstable now that we have removed 12 from the archive
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 04 Oct 2022 09:24:55 +0200
 +
 +llvm-toolchain-15 (1:15.0.1-1~exp2) experimental; urgency=medium
 +
 +  * Unbreak the clang symlink. See
 +    https://github.com/llvm/llvm-project/issues/57857
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 21 Sep 2022 00:20:54 +0200
 +
 +llvm-toolchain-15 (1:15.0.1-1~exp1) experimental; urgency=medium
 +
 +  * New upstream release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 20 Sep 2022 08:55:01 +0200
 +
 +llvm-toolchain-15 (1:15.0.0-2) experimental; urgency=medium
 +
 +  * Fix build on ppc64 and riscv64 (Closes: #1019582)
 +
 + -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 12 Sep 2022 17:58:08 +0200
 +
 +llvm-toolchain-15 (1:15.0.0-1~exp1) experimental; urgency=medium
 +
 +  * New stable release
 +  * syscall-mips64el-def.diff: fix the call to undeclared function 'syscall';
 +    on mips
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 06 Sep 2022 09:13:19 +0200
 +
 +llvm-toolchain-15 (1:15.0.0~+rc3-1~exp2) experimental; urgency=medium
 +
 +  * Update of the build dep from llvm-spirv => llvm-spirv-14
 +    as it is now versioned. It should build libclc
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 31 Aug 2022 17:10:33 +0200
 +
 +llvm-toolchain-15 (1:15.0.0~+rc3-1~exp1) experimental; urgency=medium
 +
 +  * New snapshot release
 +  * For Debian Stretch for apt.llvm.org, use clang-14 to build
 +    itself as gcc 7 isn't available
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 25 Aug 2022 13:32:14 +0200
 +
 +llvm-toolchain-15 (1:15.0.0~+rc2-1~exp1) experimental; urgency=medium
 +
 +  * Second testing release of 15
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 09 Aug 2022 17:47:53 +0200
 +
 +llvm-toolchain-15 (1:15.0.0~+rc1-1~exp1) experimental; urgency=medium
 +
 +  * First testing release of 15
 +  * Remove 'debian/patches/revert-openmp-path.diff'
 +    applied upstream
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 01 Aug 2022 09:30:39 +0200
 +
 +llvm-toolchain-15 (1:15~++20220727091640+d77882e66779-1~exp1) experimental; urgency=medium
 +
 +  * main is now 16. Creating a branch for 15.
 +  * clang doesn't have a specific SONAME anymore.
 +    See https://reviews.llvm.org/D129160 for the rational
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 27 Jul 2022 09:27:50 +0200
 +
 +llvm-toolchain-snapshot (1:15~++20220724113059+7feab85df8e8-1~exp1) experimental; urgency=medium
 +
 +  * New snapshot release
 +  * Force the SSE2 on amd64 for compiler-rt/builtin:
 +    https://reviews.llvm.org/D107082#3626632
 +  * Ship llvm-debuginfod & llvm-dwarfutil in llvm-X.Y
 +  * Install usr/lib/llvm-15/lib/libomptarget.so.15 in libomp5-15
 +    And libomptarget.rtl.amdgpu.so.15, libomptarget.rtl.cuda.so.15 and
 +    libomptarget.rtl.x86_64.so.15
 +  * Add usr/lib/llvm-15/lib/libomptarget.devicertl.a to libomp-X-dev
 +    only for [amd64 ppc64el arm64]
 +  * On Debian Buster, unwind fails to link because pthread & dl aren't found.
 +    Force the declaration as it is probably the case for every Debian & Ubuntu anyway.
 +    See unwind-force-pthread-dl.diff & https://github.com/llvm/llvm-project/issues/55629
 +  * Install llvm-driver-template.cpp.in in llvm-X.Y-dev
 +  * Remove debian/patches/x86-fuzzer.patch (done differently upstream)
 +  * Install UnicodeNameMappingGenerator in llvm-X.Y-tools
 +  * Disable libclc when spir is below 14
 +    Explicit load/store type does not match pointee type of pointer operand (Producer: 'LLVM15.0.0' Reader: 'LLVM 13.0.1')
 +  * Add the option -DLLVM_ENABLE_CURL=ON
 +    See https://github.com/llvm/llvm-project/issues/55289
 +  * Install new binary clang-offload-packager in
 +    clang-tools-15
 +
 +  [ John Paul Adrian Glaubitz ]
 +  * Enable GRPC build dependency only on supported targets
 +  * Disable compiler-rt built-ins on x32
 +  * Limit parallel link jobs for all stages on sparc and sparc64
 +  * Built compiler-rt for default target only on sparc and sparc64
 +  * Drop sparc64-specific patch D98574.patch
 +  * Drop sparc64-specific patch D98575.patch
 +
 +  [ Roman Lebedev ]
 +  * Install new binary tblgen-lsp-server into mlir-15-tools
 +
 +  [ Michael Biebl ]
 +  * Add support for systemd-binfmt (Closes: #1012370)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 24 Jul 2022 14:25:19 +0200
 +
 +llvm-toolchain-snapshot (1:15~++20220309105819+8bef17ed59aa-1~exp1) experimental; urgency=medium
 +
 +  * Try to unbreak the build (issue #54242)
 +    MLIR undef issue
 +  * New snapshot release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 09 Mar 2022 22:58:29 +0100
 +
 +llvm-toolchain-snapshot (1:15~++20220202093833+1a3137dc8451-1~exp1) experimental; urgency=medium
 +
 +  * Install new llvm-remark-size-diff in llvm-X.Y
 +  * Install clang-pseudo in clang-tools-X.Y
 +  * mlir: use the cmake option to avoid installing object files
 +    MLIR_INSTALL_AGGREGATE_OBJECTS
 +    Closes upstream #53134
 +  * Build clangd with GRPC support
 +    Thanks to Sam McCall for the patch
 +  * snapshot is now 15. 14 is in it own branch now
 +  * Ship clang-linker-wrapper in clang-tools-X.Y
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 13 Feb 2022 23:25:57 +0100
 +
 +llvm-toolchain-14 (1:14.0.6-9) unstable; urgency=medium
 +
 +  * Disable the MLIR testsuite run because of a freeze
 +    (Closes: #1024154)
 +    See https://github.com/llvm/llvm-project/issues/58357
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 15 Nov 2022 18:23:44 +0100
 +
 +llvm-toolchain-14 (1:14.0.6-8) unstable; urgency=medium
 +
 +  * Fix the lldb swig issues (closes: #1023444)
 +  * Enable LLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO to help with caching
 +  * Adjust to protobuf 3.21 (Closes: #1023533)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 04 Nov 2022 19:36:56 +0100
 +
 +llvm-toolchain-14 (1:14.0.6-7) unstable; urgency=medium
 +
 +  * Disable the cmake search for all binaries
 +    (cmake_import_check_files_for.*/bin/). Dunno why it regressed
 +    but we wasted too much time on this.
 +  * disable sccache on bionic
 +
 +  [ 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
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 27 Oct 2022 12:47:19 +0200
 +
 +llvm-toolchain-14 (1:14.0.6-6) unstable; urgency=medium
 +
 +  * Unbreak the cmake detection (Closes: #1021857, #1022414)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 23 Oct 2022 16:07:45 +0200
 +
 +llvm-toolchain-14 (1:14.0.6-5) unstable; urgency=medium
 +
 +  * Update of the build dep llvm-spirv => llvm-spirv-14
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 11 Oct 2022 08:39:18 +0200
 +
 +llvm-toolchain-14 (1:14.0.6-4) unstable; urgency=medium
 +
 +  * fix the cmake detection with libmlir
 +  * Don't build wasm target on arm64 armel mips64el mipsel ppc64el armhf
 +    for now
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 10 Oct 2022 13:47:25 +0200
 +
 +llvm-toolchain-14 (1:14.0.6-3) unstable; urgency=medium
 +
 +  * Fix a typo to silent lintian (Closes: #1018770)
 +  * Fix some hardcoded paths (Closes: #1020847)
 +  * Suggest wasi-libc for clang
 +
 +  [ Witold Baryluk ]
 +  * Allow libunwind-dev to be coinstallable (Closes: #1004112)
 +
 +  [ Faidon Liambotis ]
 +  * Add better support for the WebAssembly (wasm32/wasm64) targets:
 +    - Ship compiler-rt for the wasm32 and wasm64 targets. (Closes: #1010932)
 +    - Add patch wasm-compiler-rt-default.diff to default to compiler-rt for
 +      these targets. libgcc does not currently exist for WebAssembly in neither
 +      Debian nor upstream, and therefore compiler-rt is the only option.
 +    - Add patch wasm-sysroot-usr.diff to support a system-installed (i.e. shipped
 +      in /usr) wasi-libc. (Closes: #1020746)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 30 Aug 2022 16:10:33 +0200
  
  llvm-toolchain-14 (1:14.0.6-2) unstable; urgency=medium
  

diff --cc debian/control
index db82f765dd1cc33f5800aabc988a8c30006401b7,ab6f78fb27d643efd380f2bddf906ed2b87e9c77..a57f8544bc73d15eddd53f82efea50f0b018f9bc
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -18,24 -18,21 +18,24 @@@ 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,
 +    llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> |
 +    llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
 +    spirv-tools [ linux-any ] | hello [ !i386],
      libcurl4-dev,
      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],
      protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
  # "| hello" is for older buster/bionic distros without spirv support
- Build-Conflicts: oprofile
+ Build-Conflicts: oprofile, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
  Standards-Version: 4.2.1
  Homepage: https://www.llvm.org/
 -Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 14
 -Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/14
 +Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 15
 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/15
  
  # ------------- clang -------------
  
@@@ -628,8 -627,8 +628,8 @@@ Package: libc++-15-de
  Section: libdevel
  Architecture: any
  Multi-Arch: same
 -Depends: libc++1-14 (= ${binary:Version}), ${misc:Depends},
 - libunwind-14-dev [amd64 arm64 i386 mips64el ppc64el ppc64 riscv64]
 +Depends: libc++1-15 (= ${binary:Version}), ${misc:Depends},
-  libunwind-15-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
++ libunwind-15-dev [amd64 arm64 i386 mips64el ppc64el ppc64 riscv64]
  Breaks: libc++-dev (<< 44)
  Provides: libc++-x.y-dev
  Conflicts: libc++-x.y-dev
@@@ -725,9 -724,9 +725,9 @@@ Description: OpenCL C language implemen
  
  # ------------- libunwind -------------
  
 -Package: libunwind-14
 +Package: libunwind-15
  Section: libs
- Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+ Architecture: amd64 arm64 i386 mips64el ppc64el ppc64 riscv64
  Multi-Arch: same
  Depends: ${shlibs:Depends},
   ${misc:Depends}
@@@ -742,9 -741,9 +742,9 @@@ Description: production-quality unwinde
   or to operate on another process (aka remote), but only the local path has
   been implemented. Remote unwinding remains as future work.
  
 -Package: libunwind-14-dev
 +Package: libunwind-15-dev
  Section: libdevel
- Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
+ Architecture: amd64 arm64 i386 mips64el ppc64el ppc64 riscv64
  Multi-Arch: same
  Depends:
   ${misc:Depends},

diff --cc debian/patches/series
index 665ecd5fa9f1876a03401fd90a789ffeaa4e2351,32dc7226ef65919a89d26348080d18a434e1e6b6..b87fd331f4f5743c677adfbd57f9321cc7223b1c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -4,10 -6,9 +4,9 @@@ clang-analyzer-force-version.dif
  
  # Disabling features
  23-strlcpy_strlcat_warning_removed.diff
- 
  declare_clear_cache.diff
  unwind-chain-inclusion.diff
 -atomic_library_1.diff
 +
  # Path updates
  python-clangpath.diff
  fix-clang-path-and-build.diff
@@@ -25,10 -24,9 +22,9 @@@ disable-display-PASS-UNSUPPORTED-XFAIL.
  
  # Lib names
  0044-soname.diff
 -lldb-soname.diff
 +lldb/lldb-soname.diff
  #lldb-libname.diff
  openmp-soname.diff
- 
  # Disable some tests
  silent-gold-test.diff
  silent-more-tests.diff
@@@ -111,49 -93,38 +97,50 @@@ hurd/hurd-pathmax.dif
  # kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff
  # kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
  # kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
- 
  930008-arm.diff
  bootstrap-fix-include-next.diff
 -# riscv64
 -risc/clang-riscv64-multiarch.diff
 -# sparc64
 -D98574.patch
 -D98575.patch
 +
  # bug 939472
  #try-to-unbreak-thinlto.diff
  #D67877-cmake-clang-example.patch
 -x86-fuzzer.patch
 +
  python3-shebang.patch
 -print-lldb-path.patch
 -libcxx-armhf-ftbfs.diff
 +lldb/print-lldb-path.patch
  lower-python-dep.diff
  scan-build-py-fix-default-bin.diff
 -libclc-llvm-spirv.diff
 +
  omp-riscv64.patch
 -test-disable-lldb-i386.diff
 +lldb/test-disable-lldb-i386.diff
  unbreak-atomic-mips.diff
  llvm-fix-lld-linker-check.diff
 -compilerrt-fix-warn-xray-testing.diff
  openmp-fix-runtimes-build.diff
  libclc-fix-prepare_builtins-rpath.diff
 -libcxx-libatomic-only-with-gcc-rtlib.diff
 -libcxxabi-fix-link-builtins.diff
  llvm-runtimes-builtins-build-check.diff
 -compilerrt-builtins-arch-fix-armhf.diff
 -compilerrt-build-scudo-standalone-option.diff
 -wasm-ld-path.diff
 -python3-scan-build.py
 +issue-54242.diff
 +
 +# compiler-rt
 +compiler-rt/compilerrt-fix-warn-xray-testing.diff
 +compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
 +compiler-rt/compilerrt-build-scudo-standalone-option.diff
 +
 +
 +# wasm patches
 +wasm/wasm-ld-path.diff
 +wasm/wasm-compiler-rt-default.diff
 +wasm/wasm-sysroot-usr.diff
 +
  revert-update-doc.diff
 -fix-typo.diff
 -ubuntu-kinetic.patch
 +unwind-force-pthread-dl.diff
 +force-sse2-compiler-rt.diff
 +fix-typo-1018770.diff
 +bolt.patch
 +bolt-disable-emit-relocs.patch
 +D124841-fix-powerpc-miscompile.patch
 +mips/mips-assert-size.diff
 +protobuf_3.21.patch
 +
 +# upstream cherry-pick for mesa build
 +add-arm-vcmpz-test.patch
 +fix-mesa-build.patch
++
+ raspbian-triplet.patch

diff --cc debian/rules
index 0c47013f3e69f9e4cd874e68b9e51e1dba870086,d73421571b587c1c04faef94aa9cbf2d4301b17d..eee80bd90dbc4fc6ebe38f6bd0a277bdff764559
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -490,10 -454,13 +497,16 @@@ preconfigure
        @echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)"
        @echo "PATH=$(PATH)"
        @echo "LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)"
 +      @echo "LIBFUZZER_ENABLE=$(LIBFUZZER_ENABLE)"
 +      @echo "LTO_ENABLE=$(LTO_ENABLE)"
 +      @echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)"
  
+       # add executable flag to script we added as part of triplet hack
+       # --plugwash
+       chmod 755 llvm/cmake/config.guess.hack
+       # also make sure config.guess is executable
+       chmod 755 llvm/cmake/config.guess
+       
        for f in debian/*.in; do \
                f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
                echo "$$f => $$f2"; \
@@@ -853,9 -755,9 +866,10 @@@ endi
        fi
  
  override_dh_auto_install:
+       mkdir -p build-llvm/docs/ocamldoc/html/
        # Clean up temporary files to make sure the install works
        rm -rf $(find $(TARGET_BUILD) -wholename '*CMakeFiles*' -not -name CMakeLists.txt -a -name "*.dir" -type d)
 +
        # install/fast enables a make install without recompiling temporary files
        LD_LIBRARY_PATH=$(STAGE_2_LIB_DIR):$$LD_LIBRARY_PATH DESTDIR=$(DEB_INST)/ ninja -C $(TARGET_BUILD) $(VERBOSE) stage2-install
  
@@@ -1240,7 -1112,19 +1254,20 @@@ override_dh_auto_clean
        rm -f $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION)
        rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py
        rm -rf libclc/build
 +      rm -rf build-compiler-rt-wasm32 build-compiler-rt-wasm64
+       rm -f `find . -name '*.pyc'`
+       rm -rf debian/usr
+       rm -rf clang/tools/*-3.9
+       rm -f `find . -name '*3.9.vim'`
+       rm -f clang/tools/scan-build/man/scan-build-3.9.1 utils/vim/llvm-3.9-vimrc
+       rm -f debian/*.install
+       rm -f clang/tools/scan-view-7.0/share/FileRadar.scpt clang/tools/scan-view-7.0/share/bugcatcher.ico
+       rm -f `cat debian/morecraptoremove`
+       rm -rf debian/man
+       rm -f debian/*.links debian/c*.lintian-overrides debian/l*.lintian-overrides debian/*.META debian/*.dirs debian/*.docs debian/*.symbols debian/*.postinst debian/*.manpages debian/*.examples debian/*.binfmt debian/*.prerm
+       -rmdir clang/include/clang/Debian/
+       -rmdir lldb/docs/doc/
+       chmod 644 llvm/cmake/config.guess.hack
        if test -f lld/docs/ld.lld-$(LLVM_VERSION).1; then \
                mv lld/docs/ld.lld-$(LLVM_VERSION).1 lld/docs/ld.lld.1; \
        fi