Merge branch '16' into snapshot

This commit is contained in:
Gianfranco Costamagna 2023-04-11 14:10:43 +02:00
commit a30c862fd3
3 changed files with 22 additions and 4 deletions

18
debian/changelog vendored
View File

@ -28,6 +28,24 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 28 Jan 2023 18:07:40 +0100
llvm-toolchain-16 (1:16.0.1-1~exp2) experimental; urgency=medium
[ Sylvestre Ledru ]
* cherry pick changes from snapshot for sccache
[ Gianfranco Costamagna ]
* Use parallel=2 on riscv64
* Add omptarget again to optional interfaces (Closes: #1033933)
* Adapt test when llvm is built without Z3 support (error message changed)
-- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 11 Apr 2023 14:09:36 +0200
llvm-toolchain-16 (1:16.0.1-1~exp1) experimental; urgency=medium
* New upstream release
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 05 Apr 2023 13:25:21 +0200
llvm-toolchain-16 (1:16.0.0-1~exp5) experimental; urgency=medium
* Don't ship liborc on armel too

View File

@ -406,7 +406,7 @@ void testBitwiseRules(unsigned int a, int b) {
' > foo.c
clang-$VERSION -cc1 -analyze -analyzer-constraints=range -analyzer-checker=core,debug.ExprInspection -analyzer-constraints=z3 foo.c &> foo.log || true
if ! grep -q "LLVM was not compiled with Z3 support" foo.log; then
if ! grep -q "error: analyzer constraint manager 'z3' is only available if LLVM was built with -DLLVM_ENABLE_Z3_SOLVER=ON" foo.log; then
# Should work
clang-$VERSION -cc1 -analyze -analyzer-constraints=range -analyzer-checker=core,debug.ExprInspection -verify -analyzer-config eagerly-assume=false -analyzer-constraints=z3 foo.c
clang-$VERSION -cc1 -analyze -analyzer-constraints=range -analyzer-checker=core,debug.ExprInspection -analyzer-constraints=z3 foo.c &> foo.log

6
debian/rules vendored
View File

@ -207,9 +207,9 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc))
STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
endif
# more than 4 jobs causes OOM in Ubuntu and slows down build process.
# more than 2 jobs causes OOM in Ubuntu and slows down build process.
ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
NJOBS=3
NJOBS=2
endif
ifneq (,$(filter $(DEB_HOST_ARCH),sparc))
@ -1130,7 +1130,7 @@ endif
sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake
# Disable CMake's package validation checks for binaries that may not be installed
sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake