Merge remote-tracking branch 'origin/10' into 11

diff --git a/debian/README.source b/debian/README.source
index 3e2e1ad7b53c78aebd2b67ea2ceb4294955d040e..a5b685cc94e5a122ae0932ffcdcfaa32882eeef1 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -20,7 +20,7 @@ and symlinks are managed by the other package llvm-defaults
 
 * For armv7-a, NEON extensions are disabled.
 
-* For mips, FPXX is enabled.
+* For mips, FPXX is enabled, MADD4 instructions are disabled.
 
 * For riscv64, the hard-float ABI is used instead of the float one, and
   the target CPU is set to RV64GC instead of RV64I.

diff --git a/debian/changelog b/debian/changelog
index baa90d6bfbfe4442c00788022b7108a314287dd4..d6be134147e824cdde81956c05c417d4a9e2b6d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -282,7 +282,14 @@ llvm-toolchain-snapshot (1:11~++20200123111717+04fd2041561-1~exp1) experimental;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 23 Jan 2020 14:52:30 +0100
 
-llvm-toolchain-10 (1:10.0.1-7) UNRELEASED; urgency=medium
+llvm-toolchain-10 (1:10.0.1-8) unstable; urgency=medium
+
+  * Don't use gold on ppc64el. It fails to build in that case
+    (Closes: #972317)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 31 Oct 2020 14:13:25 +0100
+
+llvm-toolchain-10 (1:10.0.1-7) unstable; urgency=medium
 
   [ Samuel Thibault ]
   * debian/patches/hurd/hurd-cxx-paths.diff: Add missing GCC installation
@@ -290,8 +297,9 @@ llvm-toolchain-10 (1:10.0.1-7) UNRELEASED; urgency=medium
 
   [ Sylvestre Ledru ]
   * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP.
+  * Rebuild to address the incompat issues (Closes: #972282)
 
- -- Samuel Thibault <sthibault@debian.org>  Thu, 27 Aug 2020 17:06:44 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 22 Oct 2020 22:29:07 +0200
 
 llvm-toolchain-10 (1:10.0.1-6) unstable; urgency=medium
 
@@ -719,10 +727,52 @@ llvm-toolchain-snapshot (1:10~svn366440-1~exp1) experimental; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jul 2019 18:58:32 +0200
 
-llvm-toolchain-9 (1:9.0.1-12) UNRELEASED; urgency=medium
+llvm-toolchain-9 (1:9.0.1-15) unstable; urgency=low
+
+  * Replace use of deprecated $ADTTMP with $AUTOPKGTEST_TMP.
+  * Ensure fixfilepath feature is disabled.  The fixfilepath
+    feature sets a -ffile-prefix-map flag, which is only
+    supported in clang-10. (Closes: #972751).
+    Thanks to Vagrant Cascadian for the patch
+  * Don't use gold on ppc64el. It fails to build in that case
+    (Closes: #972317)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 31 Oct 2020 14:09:15 +0100
+
+llvm-toolchain-9 (1:9.0.1-14) unstable; urgency=medium
+
+  * debian/patches/b288d90b39f4b905c02092a9bfcfd6d78f99b191.patch:
+  * debian/patches/3185c30c54d0af5bffbff3bcfd721668d086ff10.patch:
+    - cherry-pick upstream fixes for ppc64el build failure (Closes: #968174)
+  * Previous version closed bug: 964988 (Closes: #964988)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 15 Aug 2020 21:53:41 +0200
+
+llvm-toolchain-9 (1:9.0.1-13) unstable; urgency=medium
+
+  [ Aurelien Jarno ]
+  * Add mips-force-nomadd4.diff to default to +nomadd4 on MIPS. (Closes:
+    #964988)
+
+  [ Ximin Luo ]
+  * Add 373184.patch to fix soundness issue affecting rustc. (Closes: #959877)
+  * Add f8e146f3430de3a6cd904f3f3f7aa1bfaefee14c.patch to fix big-endian
+    miscompilation affecting rustc.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 07 Jul 2020 18:18:00 +0200
+
+llvm-toolchain-9 (1:9.0.1-12) unstable; urgency=medium
 
   * Cherry-pick upstream patch D74453 to fix atomic compare-and-swap on
     riscv64.
+    riscv64.
+
+  [ William Grant ]
+  * debian/patches/riscv64-multilib-empty.patch: Adjust riscv64 GCC detector
+    to also check for existence of crtbegin.o in the default multilib dir,
+    like most other ports. Fixes FTBFS on riscv64, since on Ubuntu
+    /usr/lib/gcc/riscv64-linux-gnu/10 exists but is empty (gcc-10-base is
+    installed, but libgcc-10-dev is not).
 
  -- Jessica Clarke <jrtc27@debian.org>  Wed, 01 Apr 2020 16:23:55 +0100
 

diff --git a/debian/patches/series b/debian/patches/series
index 1ce66042932643380e9d99d669146d0015d79a8e..ea1fb4a9b80d5083de7d059075c809755ce0b0ec 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -83,6 +83,7 @@ libcxx/libcxx-silent-failure-arm64.diff
 
 # Change default optims
 mips-fpxx-enable.diff
+mips-force-nomadd4.diff
 26-set-correct-float-abi.diff
 clang-baseline-fix-i386.patch
 disable-sse2-old-x86.diff

diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 2be8a8c5fd3079bdf3ef42373dadf59c517624a4..82389f686115a2ecc00fdc51a84ff7d4b3f740b2 100755 (executable)
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -1120,7 +1120,7 @@ int main() {
   EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, std::move(AsmOutStream));
 }
 EOF
-clang++-$VERSION foo.cpp -o test -lclangBasic -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -ldl  /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl  -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/  `llvm-config-$VERSION --cxxflags --ldflags --libs all`
+clang++-$VERSION foo.cpp -o test -lclangBasic -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -ldl  /usr/lib/llvm-$VERSION/lib/libLLVM-$VERSION.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl  -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/ -lPolly -lPollyPPCG -lPollyISL
 
 if test ! -f /usr/bin/lldb-$VERSION; then
     echo "Install lldb-$VERSION";

diff --git a/debian/rules b/debian/rules
index 79a62880597c01193178656b570f83f21b8faff1..478689a5e3eff8e182f2cfd6da29cf1fe06f7d1d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,10 @@ ifneq (,$(filter $(DEB_HOST_ARCH),armel mipsel powerpc riscv64))
 LDFLAGS_EXTRA += -latomic
 endif
 
+# Ensure fixfilepath feature is disabled.  The fixfilepath feature
+# sets a -ffile-prefix-map flag, which is only supported in clang-10.
+export DEB_BUILD_MAINT_OPTIONS=reproducible=-fixfilepath
+
 # Cxx flags for building libcxx and libcxxabi
 LIBCXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 
@@ -129,7 +133,7 @@ endif
 #      CMAKE_EXTRA += -DLLVM_ENABLE_LLD=ON
 # endif
 
-BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
+BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0)
 ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS)))
 # -fused-ld=gold enables the gold linker (but is not supported by all archs / distro)