mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-25 12:26:07 +00:00
Revert "Bypass potential libc's sysconf wrappers for sysconf(_SC_PAGESIZE) call"
Bot can't find <sys/auxv.h> This reverts commit r298305. llvm-svn: 298343
This commit is contained in:
parent
1fb691ef33
commit
40b0b46746
@ -78,7 +78,6 @@ extern char **environ; // provided by crt1
|
||||
#endif
|
||||
|
||||
#if SANITIZER_LINUX
|
||||
#include <sys/auxv.h>
|
||||
// <linux/time.h>
|
||||
struct kernel_timeval {
|
||||
long tv_sec;
|
||||
@ -806,8 +805,6 @@ uptr GetPageSize() {
|
||||
return 4096;
|
||||
#elif SANITIZER_LINUX && (defined(__x86_64__) || defined(__i386__))
|
||||
return EXEC_PAGESIZE;
|
||||
#elif SANITIZER_LINUX
|
||||
return getauxval(AT_PAGESZ);
|
||||
#else
|
||||
return sysconf(_SC_PAGESIZE); // EXEC_PAGESIZE may not be trustworthy.
|
||||
#endif
|
||||
|
@ -1,21 +0,0 @@
|
||||
// RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
extern "C" long sysconf(int name) {
|
||||
fprintf(stderr, "sysconf wrapper called\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main() {
|
||||
// All we need to check is that the sysconf() interceptor defined above was
|
||||
// not called. Should it get called, it will crash right there, any
|
||||
// instrumented code executed before sanitizer init is finished will crash
|
||||
// accessing non-initialized sanitizer internals. Even if it will not crash
|
||||
// in some configuration, it should never be called anyway.
|
||||
fprintf(stderr, "Passed\n");
|
||||
// CHECK-NOT: sysconf wrapper called
|
||||
// CHECK: Passed
|
||||
// CHECK-NOT: sysconf wrapper called
|
||||
return 0;
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user