rebase of the patches

This commit is contained in:
Sylvestre Ledru 2022-01-06 00:01:28 +01:00
parent 4c77c827a0
commit a13a744dde

View File

@ -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-13_13.0.1~++20220105115928+0d44201451f0.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 +++ llvm-toolchain-13_13.0.1~++20220105115928+0d44201451f0/compiler-rt/test/sanitizer_common/TestCases/Linux/sysconf_interceptor_bypass_test.cpp
@@ -1,29 +0,0 @@ @@ -1,30 +0,0 @@
-// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s -// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
- -
-#include <stdio.h> -#include <stdio.h>
@ -13,12 +13,13 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/compiler-rt/test/
- -
-// getauxval() used instead of sysconf() in GetPageSize() is defined starting -// getauxval() used instead of sysconf() in GetPageSize() is defined starting
-// glbc version 2.16. -// 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) { -extern "C" long sysconf(int name) {
- fprintf(stderr, "sysconf wrapper called\n"); - fprintf(stderr, "sysconf wrapper called\n");
- return 0; - return 0;
-} -}
-#endif // defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 16) -#endif
- -
-int main() { -int main() {
- // All we need to check is that the sysconf() interceptor defined above was - // All we need to check is that the sysconf() interceptor defined above was