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

debian/changelog

@@ -41,12 +41,35 @@ 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.0-2) UNRELEASED; urgency=medium
+llvm-toolchain-10 (1:10.0.0-3) unstable; urgency=medium
+
+  * ppc64el/autopkgtest: Just like with arm64, ignore two tests
+  * Update the copyright file with recent changes (Closes: #956287)
+    Thanks to Michael Lustfield for the detective work
+
+  [ Jessica Clarke ]
+  * Cherry-pick upstream patch D74453 to fix atomic compare-and-swap on
+    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).
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 02 Apr 2020 21:48:13 +0200
+
+llvm-toolchain-10 (1:10.0.0-2) unstable; urgency=medium
 
   [ Dimitri John Ledkov <xnox@ubuntu.com> ]
   * s390x: set default abi to z196 for debian, and z13 for ubuntu.
     LP: #1864226
 
+  [ Matthias Klose <doko@ubuntu.com> ]
+  * Apply D76596.diff, proposed backport from the trunk. LP: #1867173.
+    This was causing postgresql to FTBFS with llvm 10
+
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 27 Mar 2020 05:16:28 +0100
 
 llvm-toolchain-10 (1:10.0.0-1) unstable; urgency=medium
@@ -189,7 +212,7 @@ llvm-toolchain-snapshot (1:10~+20191229111838+6991d5728f1-1~exp1) experimental;
 llvm-toolchain-snapshot (1:10~+201911120943210600592dd459242-1~exp1) experimental; urgency=medium
 
   * Repack to move to git
-  * Change the versionning scheme to git:
+  * Change the versioning scheme to git:
     Infos of the last commit
     - ~+ (this syntax is to make sure that this version > ~svn)
     - date
@@ -317,13 +340,20 @@ 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
+
+  * Cherry-pick upstream patch D74453 to fix atomic compare-and-swap on
+    riscv64.
+
+ -- Jessica Clarke <jrtc27@debian.org>  Wed, 01 Apr 2020 16:23:55 +0100
+
 llvm-toolchain-9 (1:9.0.1-11) unstable; urgency=medium
 
   * Allow one to build g++ 9 & 10 to fix a gcc build dependency
     (closes: #955144)
     And disable thin lto on all archs
     It needs gcc-8 after after 8 will reject the -flto=thin arg
-    And BOOTSTRAP_LLVM_ENABLE_LTO wil generate .so with llvm IR instead
+    And BOOTSTRAP_LLVM_ENABLE_LTO will generate .so with llvm IR instead
     of native code
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 31 Mar 2020 21:11:56 +0200

debian/copyright

@@ -24,33 +24,18 @@ License: APACHE-2-LLVM-EXCEPTIONS
  the License, but only in their entirety and only with respect to the Combined
  Software.
 
-Files: clang/lib/Headers/*
+Files: compiler-rt/lib/BlocksRuntime/*
-Copyright: 2003-2007 University of Illinois at Urbana-Champaign
+ lldb/tools/debugserver/source/MacOSX/stack_logging.h
-License: Expat
-
-Files: compiler-rt/lib/BlocksRuntime/Block.h
 Copyright: 2008-2010 Apple, Inc.
 License: MIT
 
-Files: compiler-rt/lib/BlocksRuntime/Block_private.h
+Files: llvm/lib/Support/reg*
-Copyright: 2008-2010 Apple, Inc.
-License: MIT
-
-Files: compiler-rt/lib/BlocksRuntime/data.c
-Copyright: 2008-2010 Apple, Inc.
-License: MIT
-
-Files: compiler-rt/lib/BlocksRuntime/runtime.c
-Copyright: 2008-2010 Apple, Inc.
-License: MIT
-
-Files: lib/Support/reg*
 Copyright: 1992, 1993, 1994 Henry Spencer
            1992, 1993, 1994 The Regents of the University of California
 License: BSD-3-clause
 
-Files: lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h
+Files: llvm/lib/Support/MD5.cpp llvm/include/llvm/Support/MD5.h
-Copyright: 2001 Alexander Peslyak aka Solar Designer <solar at openwall.com>
+Copyright: 2001 Alexander Peslyak <solar at openwall.com>
 License: solar-public-domain
  This software was written by Alexander Peslyak in 2001.  No copyright is
  claimed, and the software is hereby placed in the public domain.
@@ -64,7 +49,7 @@ License: solar-public-domain
  .
  * There's ABSOLUTELY NO WARRANTY, express or implied.
 
-Files: lldb/test/unittest2/*
+Files: lldb/third_party/Python/module/unittest2*
 Copyright: 1999-2003 Steve Purcell
            2003-2010 Python Software Foundation
 License: Python
@@ -83,61 +68,39 @@ License: Python
  AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
  SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-Files: polly/lib/JSON/*
+Files: llvm/llvmtest/YAMLParser/*
-Copyright: Polly Team
-License: public-domain
- **FIXME**
- polly/lib/JSON/LICENSE.txt claims that these files are in the public domain, but
- the machine-readable copyright spec requires additional clarification.
-
-Files: polly/tools/GPURuntime/*
-Copyright: Polly Team
-License: U-OF-I-BSD-LIKE or MIT
-
-Files: test/YAMLParser/*
 Copyright: 2006 Kirill Simonov
 License: MIT
 
-Files: lldb/tools/debugserver/source/MacOSX/stack_logging.h
+Files: llvm/utils/unittest/googletest/*
-Copyright: 1999-2007 Apple Inc.
-License: Apple
- This file contains Original Code and/or Modifications of Original Code
- as defined in and that are subject to the Apple Public Source License
- Version 2.0 (the 'License'). You may not use this file except in
- compliance with the License. Please obtain a copy of the License at
- http://www.opensource.apple.com/apsl/ and read it before using this
- file.
- .
- The Original Code and all software distributed under the License are
- distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- Please see the License for the specific language governing rights and
- limitations under the License.
-
-Files: utils/unittest/googletest/*
 Copyright: 2006-2008, Google Inc.
 License: BSD-3-Clause
 
-Files: libcxx/*
+Files: llvm/utils/unittest/googlemock/*
-Copyright: 2009-2019
+Copyright: 2008, Google Inc.
 License: BSD-3-Clause
- This software is provided 'as-is', without any express or implied
+
- warranty.  In no event will the authors be held liable for any damages
+Files: clang/lib/Headers/cuda_wrappers/*
- arising from the use of this software.
+ clang/lib/Headers/avx512vlvp2intersectintrin.h
+ clang/lib/Headers/avx512vp2intersectintrin.h
+Copyright: 2016-2020, Google Inc.
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
  .
- Permission is granted to anyone to use this software for any purpose,
+ The above copyright notice and this permission notice shall be included in
- including commercial applications, and to alter it and redistribute it
+ all copies or substantial portions of the Software.
- freely, subject to the following restrictions:
  .
- 1. The origin of this software must not be misrepresented; you must not
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    claim that you wrote the original software. If you use this software
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    in a product, an acknowledgment in the product documentation would be
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    appreciated but is not required.
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- 2. Altered source versions must be plainly marked as such, and must not be
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    misrepresented as being the original software.
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- 3. This notice may not be removed or altered from any source distribution.
+ THE SOFTWARE.
 
 
 License: MIT

debian/patches/series

@@ -128,6 +128,7 @@ bootstrap-fix-include-next.diff
 
 # riscv64
 clang-riscv64-multiarch.diff
+D74453-riscv-atomic_cmp_xchg.diff
 
 # Compiler-rt - workaround
 workaround-bug-42994-use-linker.diff

debian/qualify-clang.sh

@@ -299,7 +299,7 @@ if test $NBLINES -lt 100; then
     exit 42
 fi
 
-if [ $DEB_HOST_ARCH != "arm64" ]; then
+if [ $DEB_HOST_ARCH != "arm64" -a $DEB_HOST_ARCH != "ppc64el" ]; then
     # Fails on arm64 with
     # /usr/lib/llvm-10/lib/clang/10.0.0/include/mmintrin.h:33:5: error: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
     echo '#include <emmintrin.h>' > foo.cc
@@ -768,8 +768,8 @@ if ! grep "No such file or directory" foo.log; then
     if ! ./a.out 2>&1 | grep -q -E "(Test unit written|PreferSmall)"; then
         echo "fuzzer. Output:"
         ./a.out || true
-        if [ $DEB_HOST_ARCH != "arm64" ]; then
+        if [ $DEB_HOST_ARCH != "arm64" -a $DEB_HOST_ARCH != "ppc64el" ]; then
-            # Don't fail on arm64
+            # Don't fail on arm64 and ppc64el
             exit 42
         fi
     fi

debian/rules

@@ -738,7 +738,7 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' bin
 	ls -al $(CURDIR)/debian/.debhelper/*/dbgsym-root/usr/lib/debug/.build-id/*/*|| true
 	: # On some old version of Debian (stretch) and Ubuntu, Rules-Requires-Root isn't supported
 	: # Sometime, it fails because of chown: changing ownership of 'debian/.debhelper/clang-7/dbgsym-root/usr/lib/debug/.build-id/37/ba506ae9d2f82219bf5c552f7c09853052b2b0.debug': Operation not permitted
-	: # Therefor, continue when we encounter an error
+	: # Therefore, continue when we encounter an error
 	PATH=$(CURDIR)/:$$PATH LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot dh_strip -a -v || true
 	: # Remove the workaround
 	rm $(CURDIR)/strip