From a13a744dded5f9ce02903ace5c49a184b46ceb7c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Jan 2022 00:01:28 +0100 Subject: [PATCH 1/2] rebase of the patches --- debian/patches/remove-test-freezing.diff | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/patches/remove-test-freezing.diff b/debian/patches/remove-test-freezing.diff index 859bf402..1ebc19ce 100644 --- a/debian/patches/remove-test-freezing.diff +++ b/debian/patches/remove-test-freezing.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp +Index: llvm-toolchain-13_13.0.1~++20220105115928+0d44201451f0/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp =================================================================== ---- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp -+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp -@@ -1,29 +0,0 @@ +--- llvm-toolchain-13_13.0.1~++20220105115928+0d44201451f0.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp ++++ llvm-toolchain-13_13.0.1~++20220105115928+0d44201451f0/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp +@@ -1,30 +0,0 @@ -// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s - -#include @@ -13,12 +13,13 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/compiler-rt/test/ - -// getauxval() used instead of sysconf() in GetPageSize() is defined starting -// glbc version 2.16. --#if __GLIBC_PREREQ(2, 16) +-// Does not work with 2.31 and above at it calls sysconf for SIGSTKSZ. +-#if __GLIBC_PREREQ(2, 16) && !__GLIBC_PREREQ(2, 31) -extern "C" long sysconf(int name) { - fprintf(stderr, "sysconf wrapper called\n"); - return 0; -} --#endif // defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16) +-#endif - -int main() { - // All we need to check is that the sysconf() interceptor defined above was From 68e5f7c01b14b88fca071964088f97756c8da3ec Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Jan 2022 14:31:24 +0100 Subject: [PATCH 2/2] Fix the cmake file with the mlir introducing --- debian/changelog | 4 ++-- debian/rules | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9d39ab9c..40c390e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ llvm-toolchain-13 (1:13.0.1~+rc1-1~exp4) experimental; urgency=medium - * Fix the cmake with the mlir introducing + * Fix the cmake file with the mlir introducing - -- Sylvestre Ledru Mon, 03 Jan 2022 14:21:10 +0100 + -- Sylvestre Ledru Thu, 06 Jan 2022 14:30:59 +0100 llvm-toolchain-13 (1:13.0.1~+rc1-1~exp3) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index b7883353..d08f663c 100755 --- a/debian/rules +++ b/debian/rules @@ -788,7 +788,10 @@ endif rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT # Disable CMake's package validation checks for target files that we may remove. - sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|mlir-tblgen\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + +# Also disable mlir-* checks in the cmake + sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.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