diff -Nru llvm-toolchain-13-13.0.1~+rc3/debian/changelog llvm-toolchain-13-13.0.1~+rc3/debian/changelog
--- llvm-toolchain-13-13.0.1~+rc3/debian/changelog	2022-01-13 20:17:23.000000000 +0000
+++ llvm-toolchain-13-13.0.1~+rc3/debian/changelog	2022-02-10 16:53:49.000000000 +0000
@@ -1,3 +1,50 @@
+llvm-toolchain-13 (1:13.0.1~+rc3-1~exp1+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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 10 Feb 2022 16:53:49 +0000
+
 llvm-toolchain-13 (1:13.0.1~+rc3-1~exp1) experimental; urgency=medium
 
   [ Samuel Thibault ]
diff -Nru llvm-toolchain-13-13.0.1~+rc3/debian/control llvm-toolchain-13-13.0.1~+rc3/debian/control
--- llvm-toolchain-13-13.0.1~+rc3/debian/control	2022-01-13 20:17:23.000000000 +0000
+++ llvm-toolchain-13-13.0.1~+rc3/debian/control	2022-02-10 16:53:49.000000000 +0000
@@ -18,14 +18,11 @@
     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],
-    libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
-    spirv-tools [ linux-any ] | hello [ !i386]
-# "| hello" is for older buster/bionic distros without spirv support
-Build-Conflicts: oprofile
+    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
+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 snapshot
@@ -627,7 +624,7 @@
 Architecture: any
 Multi-Arch: same
 Depends: libc++1-13 (= ${binary:Version}), ${misc:Depends},
- libunwind-13-dev [amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64]
+ libunwind-13-dev [amd64 arm64 i386 mips64el ppc64el ppc64 riscv64]
 Breaks: libc++-dev (<< 44)
 Provides: libc++-x.y-dev
 Conflicts: libc++-x.y-dev
@@ -725,7 +722,7 @@
 
 Package: libunwind-13
 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,7 +739,7 @@
 
 Package: libunwind-13-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 -Nru llvm-toolchain-13-13.0.1~+rc3/debian/llvm-priv-dev.dirs llvm-toolchain-13-13.0.1~+rc3/debian/llvm-priv-dev.dirs
--- llvm-toolchain-13-13.0.1~+rc3/debian/llvm-priv-dev.dirs	2021-08-16 19:55:50.000000000 +0000
+++ llvm-toolchain-13-13.0.1~+rc3/debian/llvm-priv-dev.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/usr/lib/llvm-3.1/build
diff -Nru llvm-toolchain-13-13.0.1~+rc3/debian/morecraptoremove llvm-toolchain-13-13.0.1~+rc3/debian/morecraptoremove
--- llvm-toolchain-13-13.0.1~+rc3/debian/morecraptoremove	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-13-13.0.1~+rc3/debian/morecraptoremove	2022-02-10 16:53:49.000000000 +0000
@@ -0,0 +1,103 @@
+clang/tools/scan-build-?/CMakeLists.txt
+clang/tools/scan-build-?/bin/scan-build
+clang/tools/scan-build-?/bin/scan-build.bat
+clang/tools/scan-build-?/bin/set-xcode-analyzer
+clang/tools/scan-build-?/libexec/c++-analyzer
+clang/tools/scan-build-?/libexec/c++-analyzer.bat
+clang/tools/scan-build-?/libexec/ccc-analyzer
+clang/tools/scan-build-?/libexec/ccc-analyzer.bat
+clang/tools/scan-build-?/man/scan-build-?*.1
+clang/tools/scan-build-?/man/scan-build.1
+clang/tools/scan-build-?/share/scan-build/scanview.css
+clang/tools/scan-build-?/share/scan-build/sorttable.js
+clang/tools/scan-build-py-?*/README.md
+clang/tools/scan-build-py-?*/bin/analyze-build
+clang/tools/scan-build-py-?*/bin/analyze-c++
+clang/tools/scan-build-py-?*/bin/analyze-cc
+clang/tools/scan-build-py-?*/bin/intercept-build
+clang/tools/scan-build-py-?*/bin/intercept-c++
+clang/tools/scan-build-py-?*/bin/intercept-cc
+clang/tools/scan-build-py-?*/bin/scan-build
+clang/tools/scan-build-py-?*/libear/__init__.py
+clang/tools/scan-build-py-?*/libear/config.h.in
+clang/tools/scan-build-py-?*/libear/ear.c
+clang/tools/scan-build-py-?*/libscanbuild/__init__.py
+clang/tools/scan-build-py-?*/libscanbuild/analyze.py
+clang/tools/scan-build-py-?*/libscanbuild/arguments.py
+clang/tools/scan-build-py-?*/libscanbuild/clang.py
+clang/tools/scan-build-py-?*/libscanbuild/compilation.py
+clang/tools/scan-build-py-?*/libscanbuild/intercept.py
+clang/tools/scan-build-py-?*/libscanbuild/report.py
+clang/tools/scan-build-py-?*/libscanbuild/resources/scanview.css
+clang/tools/scan-build-py-?*/libscanbuild/resources/selectable.js
+clang/tools/scan-build-py-?*/libscanbuild/resources/sorttable.js
+clang/tools/scan-build-py-?*/libscanbuild/shell.py
+clang/tools/scan-build-py-?*/tests/__init__.py
+clang/tools/scan-build-py-?*/tests/functional/cases/__init__.py
+clang/tools/scan-build-py-?*/tests/functional/cases/test_create_cdb.py
+clang/tools/scan-build-py-?*/tests/functional/cases/test_exec_anatomy.py
+clang/tools/scan-build-py-?*/tests/functional/cases/test_from_cdb.py
+clang/tools/scan-build-py-?*/tests/functional/cases/test_from_cmd.py
+clang/tools/scan-build-py-?*/tests/functional/exec/CMakeLists.txt
+clang/tools/scan-build-py-?*/tests/functional/exec/config.h.in
+clang/tools/scan-build-py-?*/tests/functional/exec/main.c
+clang/tools/scan-build-py-?*/tests/functional/src/broken-one.c
+clang/tools/scan-build-py-?*/tests/functional/src/broken-two.c
+clang/tools/scan-build-py-?*/tests/functional/src/build/Makefile
+clang/tools/scan-build-py-?*/tests/functional/src/clean-one.c
+clang/tools/scan-build-py-?*/tests/functional/src/clean-two.c
+clang/tools/scan-build-py-?*/tests/functional/src/compilation_database/build_broken.json.in
+clang/tools/scan-build-py-?*/tests/functional/src/compilation_database/build_clean.json.in
+clang/tools/scan-build-py-?*/tests/functional/src/compilation_database/build_regular.json.in
+clang/tools/scan-build-py-?*/tests/functional/src/emit-one.c
+clang/tools/scan-build-py-?*/tests/functional/src/emit-two.c
+clang/tools/scan-build-py-?*/tests/functional/src/include/clean-one.h
+clang/tools/scan-build-py-?*/tests/functional/src/main.c
+clang/tools/scan-build-py-?*/tests/unit/__init__.py
+clang/tools/scan-build-py-?*/tests/unit/test_analyze.py
+clang/tools/scan-build-py-?*/tests/unit/test_clang.py
+clang/tools/scan-build-py-?*/tests/unit/test_compilation.py
+clang/tools/scan-build-py-?*/tests/unit/test_intercept.py
+clang/tools/scan-build-py-?*/tests/unit/test_libear.py
+clang/tools/scan-build-py-?*/tests/unit/test_report.py
+clang/tools/scan-build-py-?*/tests/unit/test_shell.py
+clang/tools/scan-build/man/scan-build-?*.1
+clang/tools/scan-view-?*/CMakeLists.txt
+clang/tools/scan-view-?*/bin/scan-view
+clang/tools/scan-view-?*/share/Reporter.py
+clang/tools/scan-view-?*/share/ScanView.py
+clang/tools/scan-view-?*/share/startfile.py
+utils/vim/ftdetect/llvm-?.vim
+utils/vim/ftdetect/tablegen-?*.vim
+utils/vim/ftplugin/llvm-?*.vim
+utils/vim/ftplugin/tablegen-?*.vim
+utils/vim/indent/llvm-?*.vim
+utils/vim/llvm-?*-vimrc
+utils/vim/syntax/llvm-?*.vim
+utils/vim/syntax/tablegen-?*.vim
+debian/clang-?-doc.docs
+debian/clang-?-examples.examples
+debian/clang-?.links
+debian/clang-?.lintian-overrides
+debian/clang-?.manpages
+debian/clang-format-?.lintian-overrides
+debian/clang-format-?.manpages
+debian/clang-tidy-?.links
+debian/clang-tidy-?.lintian-overrides
+debian/clang-tidy-?.manpages
+debian/clang-tools-?.links
+debian/clang-tools-?.lintian-overrides
+debian/clang-tools-?.manpages
+debian/libc++-?-dev.links
+debian/libc++-?-dev.lintian-overrides
+debian/libc++1-?.links
+debian/libc++1-?.lintian-overrides
+debian/libc++abi-?-dev.links
+debian/libc++abi-?-dev.lintian-overrides
+debian/libc++abi1-?.links
+debian/libc++abi1-?.lintian-overrides
+debian/libclang-?-dev.links
+debian/libclang-common-?-dev.links
+debian/libclang1-?.links
+debian/libclang1-?.lintian-overrides
+debian/libclang1-?.symbols
diff -Nru llvm-toolchain-13-13.0.1~+rc3/debian/patches/raspbian-triplet.patch llvm-toolchain-13-13.0.1~+rc3/debian/patches/raspbian-triplet.patch
--- llvm-toolchain-13-13.0.1~+rc3/debian/patches/raspbian-triplet.patch	1970-01-01 00:00:00.000000000 +0000
+++ llvm-toolchain-13-13.0.1~+rc3/debian/patches/raspbian-triplet.patch	2022-02-10 16:53:49.000000000 +0000
@@ -0,0 +1,32 @@
+hack to replace arm version in triplet returned by config.guess
+with the one we want for raspbian.
+
+--- /dev/null
++++ llvm-toolchain-9-9/llvm/cmake/config.guess.hack
+@@ -0,0 +1,2 @@
++#!/bin/bash -e
++$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/
+--- llvm-toolchain-9-9.orig/llvm/cmake/modules/GetHostTriple.cmake
++++ llvm-toolchain-9-9/llvm/cmake/modules/GetHostTriple.cmake
+@@ -18,7 +18,7 @@ function( get_host_triple var )
+     if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows AND NOT MSYS)
+       message(WARNING "unable to determine host target triple")
+     else()
+-      set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess)
++      set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack)
+       execute_process(COMMAND sh ${config_guess}
+         RESULT_VARIABLE TT_RV
+         OUTPUT_VARIABLE TT_OUT
+--- llvm-toolchain-9-9.orig/compiler-rt/cmake/base-config-ix.cmake
++++ llvm-toolchain-9-9/compiler-rt/cmake/base-config-ix.cmake
+@@ -203,8 +203,8 @@ 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 "aarch32")
diff -Nru llvm-toolchain-13-13.0.1~+rc3/debian/patches/series llvm-toolchain-13-13.0.1~+rc3/debian/patches/series
--- llvm-toolchain-13-13.0.1~+rc3/debian/patches/series	2022-01-05 23:00:32.000000000 +0000
+++ llvm-toolchain-13-13.0.1~+rc3/debian/patches/series	2022-02-10 16:53:49.000000000 +0000
@@ -6,11 +6,9 @@
 
 # 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
@@ -19,22 +17,17 @@
 clang-tidy-run-bin.diff
 0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
 debug-jit-path.diff
-
 # commented because of bug 903709
 #force-gcc-header-obj.diff
-
 do-not-fail-on-unexpected-pass.diff
 disable-display-PASS-UNSUPPORTED-XFAIL.diff
-
 # llvm-config
 0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
-
 # Lib names
 0044-soname.diff
 lldb-soname.diff
 #lldb-libname.diff
 openmp-soname.diff
-
 # Disable some tests
 silent-gold-test.diff
 silent-more-tests.diff
@@ -47,28 +40,22 @@
 remove-test-freezing.diff
 disable-llvm-symbolizer-test.diff
 disable-path-test-failing.diff
-
 # Decrease the freq for the keep alive
 test-keep-alive.diff
-
 # scan-build
 scan-build-clang-path.diff
 scan-view-fix-path.diff
 fix-scan-view-path.diff
-
 # lldb
 lldb/lldb-link-atomic-cmake.patch
 lldb/lldb-addversion-suffix-to-llvm-server-exec.patch
 lldb/lldb-missing-install.diff
 lldb/lldb-disable-swig-error.diff
-
 # Fix arch issue
 disable-error-xray.diff
-
 # OpenMP
 openmp/openmp-check-execstack.diff
 openmp/openmp-mips-affinity.patch
-
 # libcxx
 libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
 libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
@@ -76,28 +63,22 @@
 libcxx/libcxx-silent-test-libcxx.diff
 libcxx/libcxx-silent-failure-ppc64el.diff
 libcxx/libcxx-silent-failure-arm64.diff
-
 # Change default optims
 mips/mips-fpxx-enable.diff
 mips/mips-force-nomadd4.patch
 mips/mips-D101773-reloc.patch
-
 26-set-correct-float-abi.diff
 clang-baseline-fix-i386.patch
 disable-sse2-old-x86.diff
 clang-arm-default-vfp3-on-armv7a.patch
-
 # For the bootstrap
 clangd-atomic-cmake.patch
-
 # Fix docs
 #  https://reviews.llvm.org/D60380
 remove-apple-clang-manpage.diff
 0049-Use-Debian-provided-MathJax-everywhere.patch
-
 # Hurd port
 hurd/hurd-pathmax.diff
-
 # kfreebsd
 # kfreebsd/clang_lib_Basic_Targets.diff
 # kfreebsd/CMakeLists.txt.diff
@@ -113,30 +94,23 @@
 # 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
 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
@@ -152,3 +126,4 @@
 compilerrt-build-scudo-standalone-option.diff
 use-gold-for-compiler-rt-when-set.diff
 wasm-ld-path.diff
+raspbian-triplet.patch
diff -Nru llvm-toolchain-13-13.0.1~+rc3/debian/rules llvm-toolchain-13-13.0.1~+rc3/debian/rules
--- llvm-toolchain-13-13.0.1~+rc3/debian/rules	2022-01-13 20:17:23.000000000 +0000
+++ llvm-toolchain-13-13.0.1~+rc3/debian/rules	2022-02-10 16:53:49.000000000 +0000
@@ -75,7 +75,7 @@
 # collect additional cmake options for toolchain build configuration
 STAGE_1_CMAKE_EXTRA =
 STAGE_2_CMAKE_EXTRA =
-STAGE_ALL_CMAKE_EXTRA =
+STAGE_ALL_CMAKE_EXTRA = 
 # toolchain config-only var combining all stage 1 cmake options
 CMAKE_EXTRA = $(STAGE_1_CMAKE_EXTRA) $(STAGE_ALL_CMAKE_EXTRA)
 # toolchain config-only var prepending BOOTSTRAP_ to all stage 2 cmake options
@@ -96,7 +96,7 @@
 STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mipsel powerpc powerpcspe riscv64))
+ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel armhf mipsel powerpc powerpcspe riscv64))
 # For some reason, in the stage2 build, when clang is used to compile
 # itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion
 # everywhere and in all stages
@@ -150,8 +150,15 @@
   STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
 # align arch profile with debian baseline
 # https://wiki.debian.org/ArmHardFloatPort#Minimum_CPU_.26_FPU
-  CFLAGS_EXTRA += -march=armv7-a -mfpu=vfpv3-d16
-  CXXFLAGS_EXTRA += -march=armv7-a -mfpu=vfpv3-d16
+  CFLAGS_EXTRA += -march=armv6 -mfpu=vfpv2
+  CXXFLAGS_EXTRA += -march=armv6 -mfpu=vfpv2
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF
+  COMPILER_RT_USE_BUILTINS_LIBRARY := OFF
+  LIBCXX_USE_COMPILER_RT := OFF
+# disable scudo standalone (not supported for baseline armel arch: armv6)
+# note: we don't build with "k" in raspbian even though the CPU supports
+# it because armv6k atomics have forward-compatibility problems.
+  STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_SCUDO_STANDALONE=OFF
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH),i386))
@@ -240,7 +247,7 @@
 
 # Enable libunwind (or not)
 LIBUNWIND_ENABLE=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel m68k mipsel hurd-i386 powerpc sparc sparc64 x32))
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x armel armhf m68k mipsel hurd-i386 powerpc sparc sparc64 x32))
   LIBUNWIND_ENABLE=no
 # do not use compiler-rt builtins for libcxx (libcxxabi) when libunwind is
 # disabled since the gnu implementation in libgcc_s will then be required
@@ -403,6 +410,12 @@
 	@echo "LLVM_VERSION_FULL=$(LLVM_VERSION_FULL)"
 	@echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)"
 
+	# 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"; \
@@ -672,6 +685,7 @@
 	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
@@ -921,7 +935,7 @@
 # Remove auto generated python pyc
 	find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f
 
-ifeq (${RUN_TEST},yes)
+ifeq (false,true)
 # List of the archs we know we have 100 % tests working
 ARCH_LLVM_TEST_OK := i386 amd64
 
@@ -1022,6 +1036,19 @@
 	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 libcxx/build libcxxabi/build libclc/build
+	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