From: Raspbian automatic forward porter Date: Mon, 25 Nov 2019 03:12:50 +0000 (+0000) Subject: Merge version 1:9-1+rpi1 and 1:9.0.0-3 to produce 1:9.0.0-3+rpi1 X-Git-Tag: archive/raspbian/1%9.0.0-3+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0dc7b0be73f7116a1f5d4388702ee9ec0307b84c;p=llvm-toolchain-9.git Merge version 1:9-1+rpi1 and 1:9.0.0-3 to produce 1:9.0.0-3+rpi1 --- 0dc7b0be73f7116a1f5d4388702ee9ec0307b84c diff --cc debian/changelog index b365f980b,907fdda0f..5524112d1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,40 -1,96 +1,134 @@@ - llvm-toolchain-9 (1:9-1+rpi1) bullseye-staging; urgency=medium ++llvm-toolchain-9 (1:9.0.0-3+rpi1) bullseye-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 + - -- Peter Michael Green Sat, 12 Oct 2019 11:55:18 +0000 ++ -- Raspbian forward porter Mon, 25 Nov 2019 03:12:48 +0000 ++ + llvm-toolchain-9 (1:9.0.0-3) unstable; urgency=medium + + * Seems to be ok, uploading to unstable + (Closes: #942864) fuzzer issues + (Closes: #943623) libclangIndex.a are llvm ir bitcode + + -- Sylvestre Ledru Thu, 31 Oct 2019 20:36:09 +0100 + + llvm-toolchain-9 (1:9.0.0-3~exp2) experimental; urgency=medium + + [ Weston Ortiz ] + * Remove incorrect Breaks/Conflicts for lldb-9 package + https://bugs.llvm.org/show_bug.cgi?id=43451 + + [ Sylvestre Ledru ] + * disable-fuzzer-compiler-rt.diff: bring back this patch. + Still breaks i386 compiler-rt/fuzzer + Disable fuzzer only for i386 + * Use stage2 files to build the doc. For some reasons, clang-tools-extra + html generation stopped working + * Disable z3 when the version is tool old + + -- Sylvestre Ledru Thu, 31 Oct 2019 00:29:09 +0100 + + llvm-toolchain-9 (1:9.0.0-3~exp1) experimental; urgency=medium + + * Revert the change -DBOOTSTRAP_LLVM_ENABLE_LTO to use + -DLLVM_ENABLE_LTO to see if it fixes 943623 + and/or 942864 + Disable disable-fuzzer-compiler-rt.diff to evaluate the whole thing + + -- Sylvestre Ledru Tue, 29 Oct 2019 20:05:38 +0100 + + llvm-toolchain-9 (1:9.0.0-2) unstable; urgency=medium + + * polly, openmp & lldb aren't enabled for every platform + So, add to PROJECTS only when enabled + * clang: Force the installation of libclang-cpp with the exact same version + and remove libclang as dep + * With the github move, libfuzzer is now compiled as part of the build + process. It fails to compile for some unexpected reasons. + As I have been compiling libfuzzer by hand for a while, just still + do this. + See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942864 + https://bugs.llvm.org/show_bug.cgi?id=43677 + disable-fuzzer-compiler-rt.diff + * Disable all kfreebsd patches: + - Needs rebasing on snapshot often + - Didn't build on Debian for a while + - Not forwarded upstream + - No support from the team + + -- Sylvestre Ledru Sun, 20 Oct 2019 17:27:50 +0200 + + llvm-toolchain-9 (1:9.0.0-1) unstable; urgency=medium + + * Repack to move to git + * Move the checkout of the sources from svn to git + * Use -DLLVM_ENABLE_PROJECTS instead of symlinks + * Use -DBOOTSTRAP_LLVM_ENABLE_LTO instead of + -DLLVM_ENABLE_LTO (not sure what it wasn't done) + * Add dependency between libclang-cpp => libllvm with the exact version + (Closes: #942526) + + -- Sylvestre Ledru Sat, 19 Oct 2019 10:30:41 +0200 + + llvm-toolchain-9 (1:9-3) unstable; urgency=medium + + * python-clang-9: missing dependency on libclang-9-dev + (Closes: #941890) + * Enable Z3 solver (llvm & clang) to improve the quality of the static + analysis results + * Do not fail the test suite on the -lclang-cpp failing + I think I need to create a libclang-cpp-dev package to unblock it + (but dunno why it works locally) + + -- Sylvestre Ledru Thu, 17 Oct 2019 18:38:28 +0200 + + llvm-toolchain-9 (1:9-2) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Enable lldb on s390x too, it builds fine now + * python*lldb, depend on liblldb-9 to avoid failure during import + * Add a basic cmake test to see if the package is imported correctly + + [ Sylvestre Ledru ] + * add a cpuid check + * /disable-lit-cpuid-install.diff: Remove the lit-cpuid from the llvm + install. + It is provided by lldb and we don't want to add this as a new + dep from llvm-dev (Closes: #941082 #941306) + + -- Sylvestre Ledru Thu, 03 Oct 2019 18:14:21 +0200 llvm-toolchain-9 (1:9-1) unstable; urgency=medium diff --cc debian/control index ce37ddf58,f923252ec..69501ac74 --- a/debian/control +++ b/debian/control @@@ -18,9 -18,9 +18,9 @@@ Build-Depends: debhelper (>= 9.0), cmak ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x], libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], - libpfm4-dev, python3-setuptools, + libpfm4-dev, python3-setuptools, libz3-dev, g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7 -Build-Conflicts: oprofile, ocaml +Build-Conflicts: oprofile, ocaml, 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 9 diff --cc debian/patches/series index d57fe871c,6584d02cb..947565ef4 --- a/debian/patches/series +++ b/debian/patches/series @@@ -6,11 -6,11 +6,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 @@@ -19,23 -19,23 +17,18 @@@ 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 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 @@@ -48,30 -48,30 +41,24 @@@ silent-llvm-isel-fuzzer.dif 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 install-scan-build-py.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 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 @@@ -80,56 -80,56 +67,48 @@@ libcxx/libcxx-test-atomics-set-compare- libcxx/libcxx-silent-test-libcxx.diff libcxx/libcxx-silent-failure-ppc64el.diff libcxx/libcxx-silent-failure-arm64.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 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 hurd/hurd-EIEIO-undef.diff hurd/impl-path-hurd.diff -- # powerpcspe #powerpcspe/D49754-powerpcspe-clang.diff #powerpcspe/D54583-powerpcspe-double-parameter.diff #powerpcspe/D56703-powerpcspe-register-spilling.diff -- # kfreebsd - kfreebsd/clang_lib_Basic_Targets.diff - kfreebsd/CMakeLists.txt.diff - kfreebsd/compiler-rt_lib.diff - kfreebsd/include_llvm_ADT_Triple.h.diff - kfreebsd/kfreebsd-libcxx-threads-detection.diff - kfreebsd/kfreebsd-openmp.diff - kfreebsd/kfreebsd-threads-build.diff - kfreebsd/kfreebsd-triple-clang.diff - kfreebsd/kfreebsd-triple.diff - kfreebsd/lib_Support.diff - kfreebsd/lib_Target_X86.diff - kfreebsd/lldb_source_Host_freebsd_Host.cpp.diff - kfreebsd/lldb_source_Plugins_Process_FreeBSD.diff - kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff - + # kfreebsd/clang_lib_Basic_Targets.diff + # kfreebsd/CMakeLists.txt.diff + # kfreebsd/compiler-rt_lib.diff + # kfreebsd/include_llvm_ADT_Triple.h.diff + # kfreebsd/kfreebsd-libcxx-threads-detection.diff + # kfreebsd/kfreebsd-openmp.diff + # kfreebsd/kfreebsd-threads-build.diff + # kfreebsd/kfreebsd-triple-clang.diff + # kfreebsd/kfreebsd-triple.diff + # kfreebsd/lib_Support.diff + # kfreebsd/lib_Target_X86.diff + # 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 clang-riscv64-multiarch.diff clang-riscv64-rv64gc.diff -- #try-to-unbreak-thinlto.diff D67877.patch - + disable-lit-cpuid-install.diff + disable-fuzzer-compiler-rt.diff +raspbian-triplet.patch diff --cc debian/rules index df2e9b840,e71bdf7ba..aaa01e75f --- a/debian/rules +++ b/debian/rules @@@ -279,13 -296,8 +296,14 @@@ preconfigure @echo "DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS)" @echo "DISTRO=$(DISTRO)" @echo "GCC_VERSION=$(GCC_VERSION)" + @echo 'PROJECTS=$(PROJECTS_LIST)' + # 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"; \ diff --cc llvm/cmake/modules/GetHostTriple.cmake index 000000000,6c15e2d48..a4d97432d mode 000000,100644..100644 --- a/llvm/cmake/modules/GetHostTriple.cmake +++ b/llvm/cmake/modules/GetHostTriple.cmake @@@ -1,0 -1,34 +1,34 @@@ + # Returns the host triple. + # Invokes config.guess + + function( get_host_triple var ) + if( MSVC ) + if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) + set( value "x86_64-pc-windows-msvc" ) + else() + set( value "i686-pc-windows-msvc" ) + endif() + elseif( MINGW AND NOT MSYS ) + if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) + set( value "x86_64-w64-windows-gnu" ) + else() + set( value "i686-pc-windows-gnu" ) + endif() + else( MSVC ) + 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 + OUTPUT_STRIP_TRAILING_WHITESPACE) + if( NOT TT_RV EQUAL 0 ) + message(FATAL_ERROR "Failed to execute ${config_guess}") + endif( NOT TT_RV EQUAL 0 ) + # Defer to dynamic detection of the host AIX version. + string(REGEX REPLACE "-aix[0-9][^-]*" "-aix" value ${TT_OUT}) + endif() + endif( MSVC ) + set( ${var} ${value} PARENT_SCOPE ) + endfunction( get_host_triple var )