From: Peter Michael Green Date: Thu, 18 Apr 2019 12:39:52 +0000 (+0000) Subject: Merge raspbian llvm-toolchain-7 changes into llvm-toolchain-8 packaging. X-Git-Tag: archive/raspbian/1%8-3+rpi1~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8fe3dcc5b5f6c43e04e8f0058edc7ad29d96ae12;p=llvm-toolchain-8.git Merge raspbian llvm-toolchain-7 changes into llvm-toolchain-8 packaging. --- 8fe3dcc5b5f6c43e04e8f0058edc7ad29d96ae12 diff --cc cmake/modules/GetHostTriple.cmake index 7b842450b,d893071b0..21eaf8f91 --- a/cmake/modules/GetHostTriple.cmake +++ b/cmake/modules/GetHostTriple.cmake @@@ -10,12 -10,12 +10,12 @@@ function( get_host_triple var endif() elseif( MINGW AND NOT MSYS ) if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) - set( value "x86_64-w64-mingw32" ) + set( value "x86_64-w64-windows-gnu" ) else() - set( value "i686-pc-mingw32" ) + set( value "i686-pc-windows-gnu" ) 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 diff --cc debian/changelog index f5af3508c,e679f8444..4d0ab4e96 --- a/debian/changelog +++ b/debian/changelog @@@ -1,62 -1,57 +1,100 @@@ -llvm-toolchain-7 (1:7.0.1-8+rpi1) buster-staging; urgency=medium ++llvm-toolchain-8 (1:8-3+rpi1) buster-staging; urgency=medium + + [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green 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 Mon, 11 Mar 2019 22:51:24 +0000 ++ -- Peter Michael Green Thu, 18 Apr 2019 12:39:00 +0000 + -llvm-toolchain-7 (1:7.0.1-8) unstable; urgency=medium +llvm-toolchain-8 (1:8-3) unstable; urgency=medium - * Fix a segfault in autopkgtest by brining - pr39427-misscompile.diff back - (Closes: #923456) + * Fix the FTBFS on mips (introduced by my previous change) - -- Sylvestre Ledru Thu, 28 Feb 2019 13:50:21 +0100 + -- Sylvestre Ledru Tue, 02 Apr 2019 11:57:08 +0200 -llvm-toolchain-7 (1:7.0.1-7) unstable; urgency=medium +llvm-toolchain-8 (1:8-2) unstable; urgency=medium - * Fix an ABI issue introduced with the kfreebsd support - (Closes: #922731) - * kfreebsd/kfreebsd-triple-clang.diff: update of the patch to fix - the kfreebsd FTBFS (Closes: #921246) - * Enable ld gold for kfreebsd-amd64 and kfreebsd-i386 - Many thanks to Svante Signell for the three updates + * Fix the search path on mips64el (which is causing the stage2 + build of mips64el to fail + See https://bugs.llvm.org/show_bug.cgi?id=41204 + + [ Timo Aaltonen ] + * import patches for intel-opencl-clang: they fix various issues + with opengl and clang-8, and are taken from llvm master branch. + - Fix pointer blocks on OpenCL functions, that never pointed to real + functions + - Fix assertion errors on some OpenCL functions + - Refactor a little bit OpenCL calls, by emitting direct block calls. + + -- Gianfranco Costamagna Wed, 20 Mar 2019 14:36:40 +0100 + +llvm-toolchain-8 (1:8-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Tue, 19 Mar 2019 21:57:02 +0100 + +llvm-toolchain-8 (1:8~+rc5-2) unstable; urgency=medium + + * Try to fix a mips64el FTBFS + Cherry-pick of https://patches-gcc.linaro.org/patch/3032/ + + -- Sylvestre Ledru Sun, 17 Mar 2019 20:18:19 +0100 + +llvm-toolchain-8 (1:8~+rc5-1) unstable; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Tue, 12 Mar 2019 12:27:41 +0100 + +llvm-toolchain-8 (1:8~+rc4-1) unstable; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Sun, 10 Mar 2019 11:06:14 +0100 + +llvm-toolchain-8 (1:8~+rc3-1~exp1) unstable; urgency=medium + + * New snapshot release + * Activate -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN for all + gcc + + -- Sylvestre Ledru Thu, 28 Feb 2019 12:33:57 +0100 + +llvm-toolchain-8 (1:8~+rc2-1~exp3) UNRELEASED; urgency=medium + + [ Gianfranco Costamagna ] + * Commit Ubuntu delta to 8 and snapshot branches [ Matthias Klose ] * Remove the autopkg test for a genuine LLVM bug. diff --cc debian/patches/series index cbf0c7aba,5d9a7997c..93cc4e836 --- a/debian/patches/series +++ b/debian/patches/series @@@ -20,17 -19,14 +18,13 @@@ symbolizer-path.dif 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 @@@ -127,9 -133,5 +112,11 @@@ kfreebsd/lib_Target_X86.dif kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff -kfreebsd/include_llvm_MC_MCELFObjectWriter.h.diff +mips64el-fix.diff + +# patches for intel-opencl-clang +OpenCL-Change-type-of-block-pointer-for-OpenCL.patch +OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch +OpenCL-Fix-assertion-due-to-blocks.patch ++ + auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094 diff --cc debian/rules index 909eb431d,789eb9ccd..694d674a8 --- a/debian/rules +++ b/debian/rules @@@ -93,16 -93,9 +93,16 @@@ endi 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 +ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) +# avoid an issue with search path on mips64el +# https://bugs.llvm.org/show_bug.cgi?id=41204 + CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64 +endif + + ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0) control_vars = '-Vdep:devlibs=libstdc++-$(GCC_VERSION)-dev, libgcc-$(GCC_VERSION)-dev' \ '-Vdep:devlibs-objc=libobjc-$(GCC_VERSION)-dev' @@@ -250,12 -241,12 +250,18 @@@ endi preconfigure: + @echo "DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)" + @echo "DEB_HOST_GNU_TYPE=$(DEB_HOST_GNU_TYPE)" + @echo "DEB_HOST_ARCH_BITS=$(DEB_HOST_ARCH_BITS)" + @echo "DEB_HOST_ARCH=$(DEB_HOST_ARCH)" + @echo "DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS)" + + # 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"; \ @@@ -830,10 -818,11 +837,13 @@@ endi lcov --directory $(TARGET_BUILD)/ --capture --ignore-errors source --output-file $$REPORT; \ lcov --remove $$REPORT "/usr*" -o $$REPORT; \ genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \ + chmod 0755 `find reports/coverage -type d`; \ + chmod 0644 `find reports/coverage -type f`; \ fi override_dh_auto_test: + else + override_dh_auto_test: + echo testsuite disabled endif