debdiff.diff

diff -Nru llvm-toolchain-7-7.0.1/debian/changelog llvm-toolchain-7-7.0.1/debian/changelog
--- llvm-toolchain-7-7.0.1/debian/changelog	2019-02-28 13:50:21.000000000 +0100
+++ llvm-toolchain-7-7.0.1/debian/changelog	2019-03-11 23:51:24.000000000 +0100
@@ -1,3 +1,41 @@
+llvm-toolchain-7 (1:7.0.1-8+rpi1) buster-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
+
+ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Mar 2019 22:51:24 +0000
+
 llvm-toolchain-7 (1:7.0.1-8) unstable; urgency=medium
 
   * Fix a segfault in autopkgtest by brining
diff -Nru llvm-toolchain-7-7.0.1/debian/llvm-priv-dev.dirs llvm-toolchain-7-7.0.1/debian/llvm-priv-dev.dirs
--- llvm-toolchain-7-7.0.1/debian/llvm-priv-dev.dirs	2019-02-27 10:05:57.000000000 +0100
+++ llvm-toolchain-7-7.0.1/debian/llvm-priv-dev.dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/lib/llvm-3.1/build
diff -Nru llvm-toolchain-7-7.0.1/debian/morecraptoremove llvm-toolchain-7-7.0.1/debian/morecraptoremove
--- llvm-toolchain-7-7.0.1/debian/morecraptoremove	1970-01-01 01:00:00.000000000 +0100
+++ llvm-toolchain-7-7.0.1/debian/morecraptoremove	2019-03-11 23:51:24.000000000 +0100
@@ -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-7-7.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 llvm-toolchain-7-7.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094
--- llvm-toolchain-7-7.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094	1970-01-01 01:00:00.000000000 +0100
+++ llvm-toolchain-7-7.0.1/debian/patches/auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094	2019-03-11 23:51:24.000000000 +0100
@@ -0,0 +1,61 @@
+From: Peter Micahel Green <plugwash@raspbian.org>
+Subject: Automatically generated patch (1:5.0~+rc2-1+rpi1)
+
+Last (up to) 3 git changes, FYI:
+
+commit d8bb5e17a1c124bfc65bd4da3d5bad2318b86155
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Thu Sep 7 07:03:48 2017 +0000
+
+    Remove old cmake patch, dgit will regenerate it.
+
+commit 8479377cb2739eeaa610fbc0370f239e0cabda83
+Merge: 706ae0030 46e6d900f
+Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Thu Sep 7 07:11:20 2017 +0100
+
+    Merge raspbian changes from llvm-toolchain-4.0
+
+commit 706ae0030c98b01e6594ab4a4aca848e9dbedbd5
+Merge: 2b80ff9a0 b60f1e5d8
+Author: plugwash <plugwash@thinkpad>
+Date:   Thu Sep 7 07:02:37 2017 +0100
+
+    Psuedomerge to tie in 4.0 history.
+---
+
+Index: llvm-toolchain-6.0-6.0/cmake/config.guess.hack
+===================================================================
+--- /dev/null
++++ llvm-toolchain-6.0-6.0/cmake/config.guess.hack
+@@ -0,0 +1,2 @@
++#!/bin/bash -e
++$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/
+Index: llvm-toolchain-6.0-6.0/cmake/modules/GetHostTriple.cmake
+===================================================================
+--- llvm-toolchain-6.0-6.0.orig/cmake/modules/GetHostTriple.cmake
++++ llvm-toolchain-6.0-6.0/cmake/modules/GetHostTriple.cmake
+@@ -15,7 +15,7 @@ function( get_host_triple var )
+       set( value "i686-pc-mingw32" )
+     endif()
+   else( MSVC )
+-    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
+Index: llvm-toolchain-6.0-6.0/compiler-rt/cmake/base-config-ix.cmake
+===================================================================
+--- llvm-toolchain-6.0-6.0.orig/compiler-rt/cmake/base-config-ix.cmake
++++ llvm-toolchain-6.0-6.0/compiler-rt/cmake/base-config-ix.cmake
+@@ -178,8 +178,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-7-7.0.1/debian/patches/series llvm-toolchain-7-7.0.1/debian/patches/series
--- llvm-toolchain-7-7.0.1/debian/patches/series	2019-02-28 13:49:26.000000000 +0100
+++ llvm-toolchain-7-7.0.1/debian/patches/series	2019-03-11 23:51:24.000000000 +0100
@@ -6,12 +6,10 @@
 
 # Disabling features
 23-strlcpy_strlcat_warning_removed.diff
-
 27-fix_clang_stdint.diff
 declare_clear_cache.diff
 unwind-chain-inclusion.diff
 atomic_library_1.diff
-
 # Path updates
 python-clangpath.diff
 fix-clang-path-and-build.diff
@@ -21,24 +19,19 @@
 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
 fix-llvm-config-obj-src-root.patch
 fix-llvm-config.diff
 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
@@ -52,31 +45,25 @@
 disable-llvm-symbolizer-test.diff
 disable-path-test-failing.diff
 disable-source-interleave.diff
-
 # Decrease the freq for the keep alive
 test-keep-alive.diff
-
 # scan-build
 scan-build-clang-path.diff
 install-scan-build-py.diff
 scan-view-fix-path.diff
 fix-scan-view-path.diff
 scan-build-clang-X.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
 openmp/bootstrap-with-openmp-version-export-missing.diff
-
 # libcxx
 libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch
 libcxx/libcxx-test-fix-lockfree-test-for-i386.patch
@@ -85,31 +72,25 @@
 libcxx/libcxx-silent-test-libcxx.diff
 libcxx/libcxx-silent-failure-ppc64el.diff
 libcxx/libcxx-silent-failure-arm64.diff
-
 # Rust on ppc
 D51108-rust-powerpc.diff
-
 # Change default optims
 mips-fpxx-enable.diff
 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
 bootstrap-fix-include-next.diff
 clangd-atomic-cmake.patch
-
+pr39427-misscompile.diff
 # Rustc
 rustc-aarch64-test-failure.diff
-
 # Fix docs
 remove-apple-clang-manpage.diff
 0049-Use-Debian-provided-MathJax-everywhere.patch
-
 # reproducible
 reproducible-pch.diff
-
 # Hurd port
 hurd/hurd-pathmax.diff
 hurd/hurd-EIEIO-undef.diff
@@ -124,27 +105,19 @@
 hurd/D54677-hurd-path_max.diff
 hurd/hurd-cxx-paths.diff
 hurd/D53557-hurd-self-exe-realpath.diff
-
 strip-ignore-deterministic-archives.diff
-
 # powerpcspe
 powerpcspe/powerpcspe-add-missing-include-path.diff
 powerpcspe/D49754-powerpcspe-clang.diff
 powerpcspe/D54409-powerpcspe-register-spilling.diff
 powerpcspe/D54584-powerpcspe-double-parameter.diff
-
 D52340-rustc-debuginfo.diff
-
 # Disable https://llvm.org/viewvc/llvm-project?view=revision&revision=352580
 # 7.0.1 was always abi compatible with 7.0
 # Therefor, the libraries are still compatible with the 7.1.0 version
 #7.1.0/revert-change-soname-2.diff
 #7.1.0/revert-change-soname.diff
-
 # fix the abi issue
-pr39427-misscompile.diff
-
-
 # kfreebsd
 kfreebsd/clang_lib_Basic_Targets.diff
 kfreebsd/CMakeLists.txt.diff
@@ -161,3 +134,4 @@
 kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff
 kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
 kfreebsd/include_llvm_MC_MCELFObjectWriter.h.diff
+auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094
diff -Nru llvm-toolchain-7-7.0.1/debian/rules llvm-toolchain-7-7.0.1/debian/rules
--- llvm-toolchain-7-7.0.1/debian/rules	2019-02-27 10:05:57.000000000 +0100
+++ llvm-toolchain-7-7.0.1/debian/rules	2019-03-11 23:51:24.000000000 +0100
@@ -38,7 +38,7 @@
 CXXFLAGS_EXTRA =
 CFLAGS_EXTRA =
 CONFIGURE_EXTRA =
-CMAKE_EXTRA =
+CMAKE_EXTRA = -DCOMPILER_RT_BUILD_BUILTINS=OFF
 
 BASE_PATH	:= $(CURDIR)
 LIBCXX_EXCEPTIONS :=ON
@@ -47,7 +47,7 @@
 	LIBCXX_EXCEPTIONS :=OFF
 endif
 
-ifneq (,$(filter $(DEB_HOST_ARCH),i386 armel mips mipsel powerpc powerpcspe riscv64))
+ifneq (,$(filter $(DEB_HOST_ARCH),i386 armhf armel mips mipsel powerpc powerpcspe riscv64))
 CMAKE_EXTRA += -DLIBOMP_LIBFLAGS="-latomic" -DCMAKE_SHARED_LINKER_FLAGS="-latomic"
 endif
 
@@ -93,7 +93,7 @@
 
 ifneq (,$(findstring $(DEB_HOST_ARCH),armhf))
 # avoid an issue with openmp on armhf
-  CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=armv7l-unknown-linux-gnueabihf
+  CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=armv6k-unknown-linux-gnueabihf
 endif
 
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0)
@@ -241,6 +241,12 @@
 
 
 preconfigure:
+	# add executable flag to script we added as part of triplet hack
+	# --plugwash
+	chmod 755 cmake/config.guess.hack
+	# also make sure config.guess is executable
+	chmod 755 cmake/config.guess
+	
 	for f in debian/*.in; do \
 		f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
 		echo "$$f => $$f2"; \
@@ -509,6 +515,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
@@ -742,7 +749,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
 
@@ -813,6 +820,9 @@
 		genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \
 	fi
 override_dh_auto_test:
+else
+override_dh_auto_test:
+	echo testsuite disabled
 endif
 
 
@@ -836,6 +846,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
+	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 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