diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-08-16 23:30:18 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-08-16 23:32:13 -0700 |
| commit | 92b69215e63a3303a5e904ab332e2eec236e0ed2 (patch) | |
| tree | 82dc7298eba67fb6881e0a9014d251073c6a76ae /lib/tsan/interception/interception_linux.cpp | |
| parent | 1b8f0d8b56a578dbd699021dd14ea80d743b7cf8 (diff) | |
| download | zig-92b69215e63a3303a5e904ab332e2eec236e0ed2.tar.gz zig-92b69215e63a3303a5e904ab332e2eec236e0ed2.zip | |
update libcxx, libcxxabi, libunwind, and tsan to llvm 13 rc1
Diffstat (limited to 'lib/tsan/interception/interception_linux.cpp')
| -rw-r--r-- | lib/tsan/interception/interception_linux.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/tsan/interception/interception_linux.cpp b/lib/tsan/interception/interception_linux.cpp index 950cd51265..5111a87f0a 100644 --- a/lib/tsan/interception/interception_linux.cpp +++ b/lib/tsan/interception/interception_linux.cpp @@ -14,7 +14,7 @@ #include "interception.h" #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || \ - SANITIZER_OPENBSD || SANITIZER_SOLARIS + SANITIZER_SOLARIS #include <dlfcn.h> // for dlsym() and dlvsym() @@ -63,8 +63,8 @@ bool InterceptFunction(const char *name, uptr *ptr_to_real, uptr func, return addr && (func == wrapper); } -// Android and Solaris do not have dlvsym -#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD +// dlvsym is a GNU extension supported by some other platforms. +#if SANITIZER_GLIBC || SANITIZER_FREEBSD || SANITIZER_NETBSD static void *GetFuncAddr(const char *name, const char *ver) { return dlvsym(RTLD_NEXT, name, ver); } @@ -75,9 +75,9 @@ bool InterceptFunction(const char *name, const char *ver, uptr *ptr_to_real, *ptr_to_real = (uptr)addr; return addr && (func == wrapper); } -#endif // !SANITIZER_ANDROID +#endif // SANITIZER_GLIBC || SANITIZER_FREEBSD || SANITIZER_NETBSD } // namespace __interception #endif // SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || - // SANITIZER_OPENBSD || SANITIZER_SOLARIS + // SANITIZER_SOLARIS |