Merge tag '1%10.0.1-8+rpi1' of 172.17.3.10:/build/git/l/llvm-toolchain-10 into bullse...
authorPeter Michael Green <plugwash@raspbian.org>
Tue, 17 Nov 2020 14:32:50 +0000 (14:32 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Tue, 17 Nov 2020 15:57:14 +0000 (15:57 +0000)
1  2 
compiler-rt/cmake/base-config-ix.cmake
debian/changelog
debian/control
debian/patches/series
debian/rules
llvm/cmake/modules/GetHostTriple.cmake

index 57295daf8fda1f2dac218fe202937272c8a994fb,77f8fdf08d98f9f092998d13faf83f00e6c271b1..a9c3e5e709f3b7dfbedcecd191d1b2ab8541365b
 -llvm-toolchain-10 (1:10.0.1-8+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-11 (1:11.0.0-5+rpi1) bullseye-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>  Tue, 10 Nov 2020 08:20:00 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 17 Nov 2020 15:56:25 +0000
++
 +llvm-toolchain-11 (1:11.0.0-5) unstable; urgency=medium
 +
 +  [ Adrian Bunk ]
 +  * Fix the fuzzer build on i386.
 +
 +  [ Sylvestre Ledru ]
 +  * Ignore some tests on i386 to get autopkgtest fixed (Closes: #972334)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 07 Nov 2020 15:53:51 +0100
 +
 +llvm-toolchain-11 (1:11.0.0-4) unstable; urgency=medium
 +
 +  * Cherry-pick some fixes from
 +    https://github.com/opencollab/llvm-toolchain-integration-test-suite/
 +  * Only install hwasan_symbolize when found
 +  * Don't use gold on ppc64el. It fails to build in that case
 +    (Closes: #972317)
 +
 +  [ John Paul Adrian Glaubitz ]
 +  * Limit maximum parallel link jobs to 4 on sparc and sparc64
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 31 Oct 2020 21:49:01 +0100
 +
 +llvm-toolchain-11 (1:11.0.0-3) unstable; urgency=medium
 +
 +  [ Sylvestre Ledru ]
 +  * Rebuild to fix the coinstall issues (Closes: #972323)
 +  * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP.
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 19 Oct 2020 14:21:50 +0200
 +
 +llvm-toolchain-11 (1:11.0.0-2) unstable; urgency=medium
 +
 +  * Fix a clang-format issue. Fix bug #47589
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Oct 2020 15:15:27 +0200
 +
 +llvm-toolchain-11 (1:11.0.0-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 12 Oct 2020 11:14:19 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc6-1) unstable; urgency=medium
 +
 +  [ Sylvestre Ledru ]
 +  * New rc release
 +  * remove all artifacts after tests
 +
 +  [ Gianfranco Costamagna ]
 +  * qualify-clang.sh: exclude z3 tests when support is not available,
 +    not based on libz3-dev installation but on the error returned by
 +    clang invocation
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 07 Oct 2020 16:38:40 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc5-1) unstable; urgency=medium
 +
 +  * New rc release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 30 Sep 2020 20:15:40 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc4-1) unstable; urgency=medium
 +
 +  * New rc release
 +  * Fix one more test in autopkgtest
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 28 Sep 2020 22:21:47 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc3-2) unstable; urgency=medium
 +
 +  * Update of the symbol list of libomp5:
 +    - GOMP_loop_maybe_nonmonotonic_runtime_next
 +    - GOMP_loop_maybe_nonmonotonic_runtime_start
 +    - GOMP_loop_nonmonotonic_runtime_next
 +    - GOMP_loop_nonmonotonic_runtime_start
 +    - GOMP_loop_ull_maybe_nonmonotonic_runtime_next
 +    - GOMP_loop_ull_maybe_nonmonotonic_runtime_start
 +    - GOMP_loop_ull_nonmonotonic_runtime_next
 +    - GOMP_loop_ull_nonmonotonic_runtime_start
 +    - GOMP_parallel_loop_maybe_nonmonotonic_runtime
 +    - GOMP_parallel_loop_nonmonotonic_runtime
 +    - omp_display_env
 +  * Bring back LLVM_POLLY_LINK_INTO_TOOLS=ON to workaround the error
 +    clang (LLVM option parsing): Unknown command line argument '-polly'.
 +    Try: 'clang (LLVM option parsing) --help'
 +    Also found in autopkgtest
 +  * In the autopkgtest tests, update the opt arguments (-q removed and
 +    -basicaa renamed to -basic-aa)
 +  * Disable test executions on mipsel (timeout)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 27 Sep 2020 14:26:16 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc3-1) unstable; urgency=medium
 +
 +  * New rc release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 22 Sep 2020 17:19:40 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc2-6) unstable; urgency=medium
 +
 +  * Fix "libc++-11-dev includes libc++abi-11-dev headers"
 +    (Closes: #969274)
 +  * Install llvm examples in llvm-11-examples (Closes: #969339)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 07 Sep 2020 13:32:26 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc2-5) unstable; urgency=medium
 +
 +  [ John Paul Adrian Glaubitz ]
 +  * Link against libatomic on powerpc to fix FTBFS in stage2
 +  * Use dh-exec to exclude lib/libPolly*.a on powerpc and
 +    powerpcspe from libclang-common-X.Y-dev.install.in
 +
 +  [ Gianfranco Costamagna ]
 +  * autopkgtests: ignore binfmts enable command return value.
 +
 + -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 31 Aug 2020 12:26:58 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc2-4) unstable; urgency=medium
 +
 +  * integration-test-suite-test: change the configuration for 11
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 28 Aug 2020 23:08:33 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc2-3) unstable; urgency=medium
 +
 +  * Fix testsuite by ignoring binfmts test
 +    (can't be enabled on autopkgtests)
 +
 + -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 28 Aug 2020 21:56:49 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc2-2) unstable; urgency=medium
 +
 +  [ Gianfranco Costamagna ]
 +  * Disable ocaml support on i386, not reasonable to support it there
 +    (specially for Ubuntu)
 +  * Enable binfmt support before using it in tests, to fix them
 +
 +  [ Sylvestre Ledru ]
 +  * Also link against -latomic on mipsel to fix
 +   /usr/[...]/atomic_base.h:426: undefined reference to `__atomic_load_8'
 +   for lld to fix the FTBFS
 +  * Fix a FTBFS on armel with libcxx-armhf-ftbfs.diff
 +    atomic:2780:16: error: use of undeclared identifier '__libcpp_signed_lock_free'
 +    typedef atomic<__libcpp_signed_lock_free> atomic_signed_lock_free;
 +               ^
 +    atomic:2781:16: error: unknown type name '__libcpp_unsigned_lock_free'; did you mean 'atomic_signed_lock_free'?
 +    typedef atomic<__libcpp_unsigned_lock_free> atomic_unsigned_lock_free;
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 25 Aug 2020 10:44:00 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc2-1) unstable; urgency=medium
 +
 +  * New snapshot release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 20 Aug 2020 22:17:47 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc1-2) unstable; urgency=medium
 +
 +  * Don't install ompt-multiplex.h on armhf, mipsel and mips64el
 +    (Closes: #967944)
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 05 Aug 2020 15:23:25 +0200
 +
 +llvm-toolchain-11 (1:11.0.0~+rc1-1) unstable; urgency=medium
 +
 +  * Testing release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 29 Jul 2020 17:46:57 +0200
 +
 +llvm-toolchain-11 (1:11~++20200715043845+0e377e253c1-1~exp1) experimental; urgency=medium
 +
 +  [ Sylvestre Ledru ]
 +  * branching of snapshot into 11
 +
 +  [ Samuel Thibault ]
 +  * debian/patches/hurd/hurd-EIEIO-undef.diff: Remove, upstreamed.
 +  * debian/patches/hurd/hurd-cxx-paths.diff: Remove, upstreamed.
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 15 Jul 2020 16:30:36 +0200
 +
 +llvm-toolchain-snapshot (1:11~++20200701093119+ffee8040534-1~exp1) experimental; urgency=medium
 +
 +  * New snapshot release
 +  * libc++ requires the LLVM_PATH, adding it
 +  * Remove no-z3.patch, seems to be merged upstream
 +  * No longer install clang-import-test (upstream change)
 +    See https://reviews.llvm.org/D82169
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 01 Jul 2020 09:34:28 +0200
 +
 +llvm-toolchain-snapshot (1:11~++20200623122106+cd6848f6e1d-1~exp1) experimental; urgency=medium
 +
 +  * experimental New snapshot release
 +  * Add -DLLVM_POLLY_LINK_INTO_TOOLS=OFF to workaround
 +    https://bugs.llvm.org/show_bug.cgi?id=45571
 +  * New symbol clang_Type_getValueType added
 +  * Install usr/lib/llvm-11/lib/cmake/lld/*.cmake
 +    in liblld-11-dev
 +  * Upstream change ad97ccf6b26a29262c9cbf5b3e7f6e84c6dcf55f
 +    broke clangd-atomic-cmake.patch causing some undef symbol on
 +    i386 and atomic
 +  * Also install ompt-multiplex.h in libomp-X-dev
 +  * revert-sphinx-deprecation.diff: revert the sphinx update as it breaks
 +    debian buster
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 23 Jun 2020 00:24:07 +0200
 +
 +llvm-toolchain-snapshot (1:11~++20200621103028+10b0539772d-1~exp1) UNRELEASED; urgency=medium
 +
 +  * experimental New snapshot release
 +  * Add -DLLVM_POLLY_LINK_INTO_TOOLS=OFF to workaround
 +    https://bugs.llvm.org/show_bug.cgi?id=45571
 +  * New symbol clang_Type_getValueType added
 +  * Install usr/lib/llvm-11/lib/cmake/lld/*.cmake
 +    in liblld-11-dev
 +  * Upstream change ad97ccf6b26a29262c9cbf5b3e7f6e84c6dcf55f
 +    broke clangd-atomic-cmake.patch causing some undef symbol on
 +    i386 and atomic
 +  * Also install ompt-multiplex.h in libomp-X-dev
 +  * revert-sphinx-deprecation.diff: revert the sphinx update as it breaks debian
 +    buster
 +  * experimental New snapshot release
 +  * Add -DLLVM_POLLY_LINK_INTO_TOOLS=OFF to workaround
 +    https://bugs.llvm.org/show_bug.cgi?id=45571
 +  * New symbol clang_Type_getValueType added
 +  * Install usr/lib/llvm-11/lib/cmake/lld/*.cmake
 +    in liblld-11-dev
 +  * Upstream change ad97ccf6b26a29262c9cbf5b3e7f6e84c6dcf55f
 +    broke clangd-atomic-cmake.patch causing some undef symbol on
 +    i386 and atomic
 +  * experimental New snapshot release
 +  * experimental New snapshot release
 +  * experimental New snapshot release
 +  * experimental New snapshot release
 +  * experimental New snapshot release
 +  * experimental New snapshot release
 +  * experimental New snapshot release
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 21 Jun 2020 10:33:23 +0200
 +
 +llvm-toolchain-snapshot (1:11~++20200410111154+35052267023-1~exp1) experimental; urgency=medium
 +
 +  * New snapshot release
 +  * Bring back libc++-experimental
 +  * remove no-cgi.patch - applied upstream
 +  * Also install liblldMachO2.a in liblld
 +  * Reoder the cmake arg
 +  * Update the copyright file with recent changes (Closes: #956287)
 +    Thanks to Michael Lustfield for the detective work
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 11 Apr 2020 12:03:35 +0200
 +
 +llvm-toolchain-snapshot (1:11~++20200409051253+d08105482e1-1~exp1) experimental; urgency=medium
 +
 +  * New snapshot release
 +  * Bring back libc++-experimental
 +  * remove no-cgi.patch - applied upstream
 +  * Also install liblldMachO2.a in liblld
 +  * Reoder the cmake arg
 +  * Update the copyright file with recent changes (Closes: #956287)
 +    Thanks to Michael Lustfield for the detective work
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 09 Apr 2020 17:21:05 +0200
 +
 +llvm-toolchain-snapshot (1:11~++20200307074845+ec1d1f6ae70-1~exp1) experimental; urgency=medium
 +
 +  [ Sylvestre Ledru ]
 +  * experimental New snapshot release
 +  * Install clang-tidy headers in libclang-X.Y-dev
 +    Path: usr/lib/llvm-11/include/clang-tidy/
 +    Introduced upstream in https://reviews.llvm.org/D73236
 +
 +  [ Samuel Thibault ]
 +  * hurd/hurd-cxx-paths.diff: Drop part of patch applied upstream, fix it so
 +    it can be applied.
 +  * clang-tools-X.Y.install.in: Do not try to install hwasan_symbolize on
 +    hurd-any.
 +
 +  [ Gianfranco Costamagna ]
 +  * Add patch to port from old cgi to new html python3 method
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 07 Mar 2020 19:51:40 +0100
 +
 +llvm-toolchain-snapshot (1:11~++20200123111717+04fd2041561-1~exp1) experimental; urgency=medium
 +
 +  [ Sylvestre Ledru ]
 +  * experimental New snapshot release - 11
 +  * Merge recent 9 changes (python 3 and testsuite mostly)
 +
 +  [ Gianfranco Costamagna ]
 +  * fix lldb-10 -P path print (Closes: #945445)
 +  * Fix lldb python installation path and symlinks
 +  * Drop version constraint from libffi-dev library, satisfied since
 +    old-old-stable
 +
 + -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 23 Jan 2020 14:52:30 +0100
  
  llvm-toolchain-10 (1:10.0.1-8) unstable; urgency=medium
  
diff --cc debian/control
index a9dd18957b86ee09cf97dc698e488acafbf06448,bbd16d0d54ddce52d0ddd40b9cb7bd0d0947caf3..8e3628826b706c47a1736b9f2ddf4dbb556ab5cf
@@@ -19,11 -19,11 +19,11 @@@ Build-Depends: debhelper (>= 9.0), cmak
      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, 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 10
 -Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/10
 +Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 11
 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/11
  
  # ------------- clang -------------
  
index c447cb9bc79f18b6d3ecc608155169eb2e982c87,b3a68fae1f8af09860f454b24addb5d4f6cfdbd7..ebac776bee6a18be41c3d168236940dd7aa2e7ff
@@@ -80,10 -67,9 +67,9 @@@ 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
 -mips-force-nomadd4.patch
 +mips-force-nomadd4.diff
  26-set-correct-float-abi.diff
  clang-baseline-fix-i386.patch
  disable-sse2-old-x86.diff
@@@ -96,10 -80,9 +80,8 @@@ clangd-atomic-cmake.patc
  #  https://reviews.llvm.org/D60380
  remove-apple-clang-manpage.diff
  0049-Use-Debian-provided-MathJax-everywhere.patch
  # Hurd port
 -hurd/hurd-cxx-paths.diff
  hurd/hurd-pathmax.diff
  # powerpcspe
  #powerpcspe/D49754-powerpcspe-clang.diff
  #powerpcspe/D54583-powerpcspe-double-parameter.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
  risc/clang-riscv64-multiarch.diff
 -risc/riscv64-multilib-empty.patch
 +
  # Compiler-rt - workaround
  workaround-bug-42994-use-linker.diff
  # bug 939472
  #try-to-unbreak-thinlto.diff
  D67877.patch
 -disable-fuzzer-compiler-rt-x86.diff
 -no-z3.patch
 +
 +x86-fuzzer.patch
 +
  python3-shebang.patch
  print-lldb-path.patch
 -no-cgi.patch
 -0001-systemz-allow-configuring-default-SYSTEMZ_DEFAULT_AR.patch
 -ubuntu-groovy.diff
 -clang_vendor_pass_stage2.diff
 -remove-trailing-space-version.diff
 -PowerPC-PPCBoolRetToInt-Dont-translate-Constants-operands.diff
 +libcxx-armhf-ftbfs.diff
 +fix-clang-format-bug-47589.patch
 +#0001-tsan-doesn-t-work-on-arm.patch
 +#0002-Disable-test_asan_heap.c-for-arm-30.patch
 +#0003-leaksan-add-a-test-31.patch
 +silent-integration-test-suite-i386.diff
+ raspbian-triplet.patch
diff --cc debian/rules
index a596d71f292efada639a4c07594923fbc64a014e,a6f37113d1d832efe241f34ff302b6a6021e6136..93add5c8966807354b6ee30a39c83c71c3dd63cb
@@@ -309,10 -300,14 +309,16 @@@ preconfigure
        @echo "DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS)"
        @echo "DISTRO=$(DISTRO)"
        @echo "GCC_VERSION=$(GCC_VERSION)"
 -      @echo 'PROJECTS=$(PROJECTS_LIST)'
 +      @echo "PROJECTS=$(PROJECTS_LIST)"
 +      @echo "LLVM_VERSION=$(LLVM_VERSION)"
 +      @echo "LLVM_VERSION_FULL=$(LLVM_VERSION_FULL)"
  
+       # 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"; \