From 85695b66a929101b26a21077e1db36ab175a399a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 24 Dec 2021 18:28:30 +0100 Subject: [PATCH] Revert "rebase of the patches" This reverts commit 052edd2547c53c062af24522209b00ea671bbe73. --- debian/patches/remove-test-freezing.diff | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/patches/remove-test-freezing.diff b/debian/patches/remove-test-freezing.diff index b1204ac0..859bf402 100644 --- a/debian/patches/remove-test-freezing.diff +++ b/debian/patches/remove-test-freezing.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-13_13.0.1~++20211222105905+ae24102617c9/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp +Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp =================================================================== ---- llvm-toolchain-13_13.0.1~++20211222105905+ae24102617c9.orig/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp -+++ llvm-toolchain-13_13.0.1~++20211222105905+ae24102617c9/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp -@@ -1,30 +0,0 @@ +--- 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 @@ -// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s - -#include @@ -13,13 +13,12 @@ Index: llvm-toolchain-13_13.0.1~++20211222105905+ae24102617c9/compiler-rt/test/s - -// getauxval() used instead of sysconf() in GetPageSize() is defined starting -// glbc version 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) +-#if __GLIBC_PREREQ(2, 16) -extern "C" long sysconf(int name) { - fprintf(stderr, "sysconf wrapper called\n"); - return 0; -} --#endif +-#endif // defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16) - -int main() { - // All we need to check is that the sysconf() interceptor defined above was