Manual merge of version 1:7-6+rpi1 and 1:7.0.1-1 to produce 1:7.0.1-1+rpi1 archive/raspbian/1%7.0.1-1+rpi1 raspbian/1%7.0.1-1+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Tue, 25 Dec 2018 03:37:28 +0000 (03:37 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Tue, 25 Dec 2018 03:37:28 +0000 (03:37 +0000)
1  2 
debian/changelog
debian/patches/series
debian/rules

index ccaaf1319b7b8c5c5f1220c374322dbd664a263d,36044aa861794244b78e85f5a05c2edefb59c7bd..e9c94502921e3fed1ed26827b10e506f4e1bce9a
- llvm-toolchain-7 (1:7-6+rpi1) buster-staging; urgency=medium
++llvm-toolchain-7 (1:7.0.1-1+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 03 May 2018 16:57:05 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 24 Dec 2018 21:11:43 +0000
++
+ llvm-toolchain-7 (1:7.0.1-1) unstable; urgency=medium
+   * New release
+   * Remove the dbg workaround. Hopefully, the new version of 
+     binutils will fix it (Closes: #913946)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 16 Dec 2018 13:07:54 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc3-2) unstable; urgency=medium
+   * Fix llvm-config by stripping unnecessary flags
+     See also https://bugs.llvm.org/show_bug.cgi?id=8220
+     (Closes: #697755, #914838)
+   * Try to workaround the debug issues by adding -fno-addrsig to the *FLAGS
+     One more time, thanks to Rebecca Palmer (Closes: #913946)
+     The goal is to provide correct debug packages.
+     Workaround https://sourceware.org/bugzilla/show_bug.cgi?id=23788
+   * Force the chmod +x on llvm-X/bin/* because it was sometimes removed
+     by the strip process
+   * Force the link to atomic also for i386 as it fails on Debian jessie too
+   * Improved the debian/patches/series presentation by creating categories
+   * Improve the separation between *FLAGS for gcc and clang.
+     This is done for -fno-addrsig as it doesn't exit for gcc
+     This can be done with the BOOTSTRAP_CMAKE_CXX_FLAGS option
+  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 10 Dec 2018 03:49:59 -0500
+ llvm-toolchain-7 (1:7.0.1~+rc3-1) unstable; urgency=medium
+   * New testing release
+   * disable the llvm-strip as it created too big llvm lib
+   [ John Paul Adrian Glaubitz ]
+   * Add patch to add powerpcspe support to clang
+   * Add patch to fix register spilling on powerpcspe
+   * Add patch to optimize double parameter calling setup on powerpcspe
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 08 Dec 2018 07:29:59 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-8) unstable; urgency=medium
+   * Use llvm-strip instead of binutils strip.
+     Two reasons:
+       - with clang stage2, the dbg packages were not generated
+       - strip fails on stretch and other ubuntu on some archives
+     For this, I had to silent the --enable-deterministic-archives
+     option (https://bugs.llvm.org/show_bug.cgi?id=39789).
+     Thanks to Rebecca Palmer for the idea
+     (Closes: #913946)
+   * Change the i386 base line to avoid using sse2 extension
+     This is more important now that llvm is built with clang
+     instead of gcc.
+     Thanks to Fanael Linithien for the patch
+     (Closes: #914770, #894840)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 01 Dec 2018 11:18:39 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-7) unstable; urgency=medium
+   * Bring back mips-rdhwr.diff as it isn't in rc2
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 25 Nov 2018 17:00:31 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-6) unstable; urgency=medium
+   [ Samuel Thibault ]
+   * D53557-hurd-self-exe-realpath.diff: Fix paths returned by
+     llvm-config (See Bug#911817).
+   [ Sylvestre Ledru ]
+   * Fix the FTBFS on armhf for real! Thanks to Adrian Bunk
+     Force the activation of FeatureVFP3 & FeatureD16
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 24 Nov 2018 09:12:26 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-5) unstable; urgency=medium
+   [ Samuel Thibault ]
+   * D54079-hurd-openmp.diff, D54338-hurd-libcxx-threads-build.diff,
+     D54339-hurd-libcxx-threads-detection.diff, D54378-hurd-triple.diff,
+     D54379-hurd-triple-clang.diff, D54677-hurd-path_max.diff,
+     hurd-cxx-paths.diff: New patches to fix hurd build.
+   [ Sylvestre Ledru ]
+   * Remove mips-rdhwr.diff as it has been applied upstream
+   * Fix a baseline violation on armhf (Closes: #914268)
+     clang-arm-default-vfp3-on-armv7a.patch has been updated to disable
+     neon in another place
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 21 Nov 2018 09:45:00 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-4) unstable; urgency=medium
+   * Workaround the build issues on armhf
+     Thanks to Adrian Bunk for the idea
+   * Remove useless symlink /usr/include/c++ -> ../lib/llvm-7/include/c++
+     (Closes: #913400)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 16 Nov 2018 22:46:29 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-3) unstable; urgency=medium
+   * Disable gold for sparc* (Closes: #913260)
+   * Hide a symbol in openmp for mips64el
+   * Try to integrate a pach to make pch reproducible
+     Thanks to Rebecca Palmer for the patch
+     (Closes: #877359)
+   * Fix the misscompilation issue causing rustc to crash (Closes: #913271)
+     Might cause some ABI issues but no real good solution.
+     See https://bugs.llvm.org/show_bug.cgi?id=39427
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 08 Nov 2018 20:50:39 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-2) unstable; urgency=medium
+   * Fix a non-break space in a patch (Closes: #913213)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 08 Nov 2018 09:28:36 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-1) unstable; urgency=medium
+   * Upload of 7.0.1 rc2 into unstable
+   * New testing release
+   * Enable the stage2 bootstrap:
+     - stage1 = build clang with gcc
+     - stage2 = clang building itself
+     (Closes: #909234)
+   * Bring back the Disable NEON generation on armhf patch which was gone
+     Should fix the FTBFS on armhf
+     (Closes: #842142)
+   * Update the clang manpage to remove osx specific options
+     and to add -arch (Closes: #743133)
+   * Bring back usr/lib/@DEB_HOST_MULTIARCH@/{libiomp5.so, libomp5.so}
+     symlink for gcc (Closes: #912641)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 07 Nov 2018 15:17:41 +0100
+ llvm-toolchain-7 (1:7.0.1~+rc2-1~exp1) experimental; urgency=medium
+   * New testing release
+  -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 05 Nov 2018 23:38:34 +0100
+ llvm-toolchain-7 (1:7-9) unstable; urgency=medium
+   * Remove the dump of cmake error file (too confusing)
+   * Try to fix the bootstrap FTBFS :
+     - on armel by forcing the link to -latomic
+     - mips-rdhwr.diff: backport D51773 to fix an
+       assembly issue on mips.
+       Thanks to jrtc27 for finding the issue.
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 04 Nov 2018 18:07:23 +0100
+ llvm-toolchain-7 (1:7-8) unstable; urgency=medium
+   * Update the watch file to display the right version
+     (even if the download will fail)
+   * clang-7 suggests libomp-7-dev instead of libomp-dev
+   * Make sure that we don't conflict openmp & libc++ with llvm-defaults's
+     (Closes: #912544)
+   * Handle better the non coinstability of openmp & libc++ (like we are doing
+     with python-clang-*)
+   * Backport upstream fix D51749 to address a rust aarch64 issues
+     (Closes: #909705)
+   * Add tests from old bugs to make sure they don't come back
+     (Closes: #889832, #827866)
+   * The sanitizers use the versionned llvm-symbolizer provided by the
+     llvm-X package (Closes: #753572)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 20 Oct 2018 16:00:58 +0200
+ llvm-toolchain-7 (1:7-7~exp2) experimental; urgency=medium
+   * clangd-atomic-cmake.patch: Link against atomic for clangd in i386
+   * When the cmake configure of the stage2 is failing, dump the cmake error log
+   * Declare some variables (-Wno-*) for all platforms (was failing on mips)
+   * Update the watch file to display the right version
+     (even if the download will fail)
+   * clang-7 suggests libomp-7-dev instead of libomp-dev
+   * Make sure that we don't conflict openmp & libc++ with llvm-defaults's
+     (Closes: #912544)
+   * Handle better the non coinstability of openmp & libc++ (like we are doing
+     with python-clang-*)
+   * Backport upstream fix D51749 to address a rust aarch64 issues
+     (Closes: #909705)
+   * Add tests from old bugs to make sure they don't come back
+     (Closes: #889832, #827866)
+   * The sanitizers use the versionned llvm-symbolizer provided by the
+     llvm-X package (Closes: #753572)
+  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 21 Oct 2018 18:34:20 +0200
+ llvm-toolchain-7 (1:7-7~exp1) experimental; urgency=medium
+   * Experiment the clang bootstrap
+   * Try to boostrap clang using clang
+  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 17 Oct 2018 20:15:57 +0200
+ llvm-toolchain-7 (1:7-7) unstable; urgency=medium
+   [ Samuel Thibault ]
+   * Apply hurd fixes (Closes: #908847).
+    - hurd-lib_Support_Unix_Path.inc.diff
+    - hurd-pathmax.diff
+    - hurd-tools_llvm-shlib_CMakeLists.txt.diff
+  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Oct 2018 16:50:58 +0200
  
  llvm-toolchain-7 (1:7-6) unstable; urgency=medium
  
index 013b831d38c08dba6a2ceccdb63d59b5aee75a69,a620afa6e104db09a667045cd039bf116fc9b515..e48e360c6f6188d6cc11873821df753ecad595dc
@@@ -1,67 -1,82 +1,69 @@@
+ # Debian versions
  19-clang_debian_version.patch
+ 0003-Debian-version-info-and-bugreport.patch
+ clang-format-version.diff
+ clang-analyzer-force-version.diff
+ # Disabling features
  23-strlcpy_strlcat_warning_removed.diff
 -
  27-fix_clang_stdint.diff
- 26-set-correct-float-abi.diff
- 0003-Debian-version-info-and-bugreport.patch
- scan-build-clang-path.diff
  declare_clear_cache.diff
- clang-format-version.diff
  unwind-chain-inclusion.diff
- hurd-pathmax.diff
- silent-gold-test.diff
  atomic_library_1.diff
 -
+ # Path updates
  python-clangpath.diff
  fix-clang-path-and-build.diff
 -
+ 0048-Set-html_static_path-_static-everywhere.patch
+ x32-fix-driver-search-paths.diff
+ symbolizer-path.diff
+ clang-tidy-run-bin.diff
+ 0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
  # commented because of bug 903709
  #force-gcc-header-obj.diff
 -
  do-not-fail-on-unexpected-pass.diff
- silent-more-tests.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
hurd-EIEIO-undef.diff
openmp-soname.diff
 -
+ # Disable some tests
+ silent-gold-test.diff
+ silent-more-tests.diff
  silent-MCJIIT-tests.diff
- clang-analyzer-force-version.diff
- install-scan-build-py.diff
- scan-view-fix-path.diff
- mips-fpxx-enable.diff
- 0001-llvm-cmake-resolve-symlinks-in-LLVMConfig.cmake.patch
- 0001-tools-clang-cmake-resolve-symlinks-in-ClangConfig.cmake.patch
- lldb-link-atomic-cmake.patch
- disable-source-interleave.diff
  silent-gold-utils.diff
- disable-llvm-symbolizer-test.diff
- #fix-lldb-server-build
- clang-tidy-run-bin.diff
- #bug-30342.diff
- fix-scan-view-path.diff
- #clang-fix-cmpxchg8-detection-on-i386.patch
- lldb-addversion-suffix-to-llvm-server-exec.patch
- lldb-missing-install.diff
  silent-test-failing-codeverage.diff
- disable-path-test-failing.diff
  silent-amd-tet.diff
- disable-error-xray.diff
- lldb-disable-swig-error.diff
  silent-test-macho.diff
  silent-llvm-isel-fuzzer.diff
- test-keep-alive.diff
  remove-test-freezing.diff
- 0048-Set-html_static_path-_static-everywhere.patch
- 0049-Use-Debian-provided-MathJax-everywhere.patch
- impl-path-hurd.diff
- powerpcspe-add-missing-include-path.diff
- x32-fix-driver-search-paths.diff
+ 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-link-atomic-cmake.patch
+ lldb-addversion-suffix-to-llvm-server-exec.patch
+ lldb-missing-install.diff
+ lldb-disable-swig-error.diff
 -
+ # Fix arch issue
+ disable-error-xray.diff
 -
  # OpenMP
  openmp-check-execstack.diff
- openmp-soname.diff
  openmp-mips-affinity.patch
 -
+ bootstrap-with-openmp-version-export-missing.diff
  # libcxx
  libcxxabi-test-don-t-fail-extended-long-double.patch
  libcxx-test-fix-lockfree-test-for-i386.patch
  libcxxabi-arm-ehabi-fix.patch
@@@ -69,13 -84,51 +71,43 @@@ libcxx-test-atomics-set-compare-exchang
  libcxx-silent-test-libcxx.diff
  libcxx-silent-failure-ppc64el.diff
  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
- scan-build-clang-X.diff
- 0001-analyzer-scan-build-if-status-bugs-is-passed-don-t-f.patch
- #bootstrap-fix-include-next.diff
- #bootstrap-with-openmp-version-export-missing.diff
+ clang-arm-default-vfp3-on-armv7a.patch
 -
+ # For the boostrap
+ 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-pathmax.diff
+ hurd-EIEIO-undef.diff
+ impl-path-hurd.diff
+ hurd-lib_Support_Unix_Path.inc.diff
+ hurd-tools_llvm-shlib_CMakeLists.txt.diff
+ D54079-hurd-openmp.diff
+ D54338-hurd-libcxx-threads-build.diff
+ D54339-hurd-libcxx-threads-detection.diff
+ D54378-hurd-triple.diff
+ D54379-hurd-triple-clang.diff
+ D54677-hurd-path_max.diff
+ hurd-cxx-paths.diff
+ D53557-hurd-self-exe-realpath.diff
 -
+ strip-ignore-deterministic-archives.diff
 -
+ # powerpcspe
+ powerpcspe-add-missing-include-path.diff
+ D49754-powerpcspe-clang.diff
+ D54409-powerpcspe-register-spilling.diff
+ D54584-powerpcspe-double-parameter.diff
 +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094
diff --cc debian/rules
index 4aeb859774023ffafc17d44233ec58ff9ef01a31,dbacd0796ca967a424ff50c37eb320e272bd155d..aa0e479f20784712d053bd5b8d5cca61ad9522fd
@@@ -32,8 -36,9 +36,9 @@@ DEB_HOST_ARCH_OS    ?= $(shell dpkg-arc
  
  LDFLAGS_EXTRA =
  CXXFLAGS_EXTRA =
+ CFLAGS_EXTRA =
  CONFIGURE_EXTRA =
 -CMAKE_EXTRA =
 +CMAKE_EXTRA = -DCOMPILER_RT_BUILD_BUILTINS=OFF
  
  BASE_PATH     := $(CURDIR)
  LIBCXX_EXCEPTIONS :=ON
@@@ -42,7 -47,7 +47,7 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),s390x
        LIBCXX_EXCEPTIONS :=OFF
  endif
  
- ifneq (,$(filter $(DEB_HOST_ARCH),armhf armel mips mipsel powerpc powerpcspe riscv64))
 -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
  
@@@ -759,18 -827,8 +837,21 @@@ override_dh_auto_clean
        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
  
- .PHONY: override_dh_strip preconfigure
+ .PHONY: override_dh_strip preconfigure debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build