diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-11-12 10:21:52 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-11-12 10:21:52 +0000 |
| commit | 90e12a6cb2096917a89fbe18b391cf3e95c69c13 (patch) | |
| tree | 38c8edf52cb51c3bc62915c6fe0156e01de938d3 | |
| parent | 44657ef6e5234902e0f34d8e3bcf9d10993bd45e (diff) | |
| download | bcm5719-llvm-90e12a6cb2096917a89fbe18b391cf3e95c69c13.tar.gz bcm5719-llvm-90e12a6cb2096917a89fbe18b391cf3e95c69c13.zip | |
[sanitizer] Avoid needless use of stringification (#symver) in INTERCEPT_FUNCTION_VER.
This is a workaround for clang-format bug (PR17874).
llvm-svn: 194468
| -rw-r--r-- | compiler-rt/lib/interception/interception_linux.h | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_interceptors.cc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/compiler-rt/lib/interception/interception_linux.h b/compiler-rt/lib/interception/interception_linux.h index b2f74d105eb..cea957320d0 100644 --- a/compiler-rt/lib/interception/interception_linux.h +++ b/compiler-rt/lib/interception/interception_linux.h @@ -37,7 +37,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); #if !defined(__ANDROID__) // android does not have dlvsym # define INTERCEPT_FUNCTION_VER_LINUX(func, symver) \ ::__interception::real_##func = (func##_f)(unsigned long) \ - ::__interception::GetFuncAddrVer(#func, #symver) + ::__interception::GetFuncAddrVer(#func, symver) #else # define INTERCEPT_FUNCTION_VER_LINUX(func, symver) \ INTERCEPT_FUNCTION_LINUX(func) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index 6deca378f82..c8ea7187e1a 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -2231,13 +2231,13 @@ INTERCEPTOR(int, pthread_cond_broadcast, void *c) { } #define INIT_PTHREAD_COND_WAIT \ - INTERCEPT_FUNCTION_VER(pthread_cond_wait, GLIBC_2.3.2) + INTERCEPT_FUNCTION_VER(pthread_cond_wait, "GLIBC_2.3.2") #define INIT_PTHREAD_COND_INIT \ - INTERCEPT_FUNCTION_VER(pthread_cond_init, GLIBC_2.3.2) + INTERCEPT_FUNCTION_VER(pthread_cond_init, "GLIBC_2.3.2") #define INIT_PTHREAD_COND_SIGNAL \ - INTERCEPT_FUNCTION_VER(pthread_cond_signal, GLIBC_2.3.2) + INTERCEPT_FUNCTION_VER(pthread_cond_signal, "GLIBC_2.3.2") #define INIT_PTHREAD_COND_BROADCAST \ - INTERCEPT_FUNCTION_VER(pthread_cond_broadcast, GLIBC_2.3.2) + INTERCEPT_FUNCTION_VER(pthread_cond_broadcast, "GLIBC_2.3.2") #else #define INIT_PTHREAD_COND_WAIT #define INIT_PTHREAD_COND_INIT diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc index 0b956224a1e..71bfaf3465e 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc @@ -2103,8 +2103,8 @@ void InitializeInterceptors() { TSAN_INTERCEPT(pthread_rwlock_timedwrlock); TSAN_INTERCEPT(pthread_rwlock_unlock); - INTERCEPT_FUNCTION_VER(pthread_cond_destroy, GLIBC_2.3.2); - INTERCEPT_FUNCTION_VER(pthread_cond_timedwait, GLIBC_2.3.2); + INTERCEPT_FUNCTION_VER(pthread_cond_destroy, "GLIBC_2.3.2"); + INTERCEPT_FUNCTION_VER(pthread_cond_timedwait, "GLIBC_2.3.2"); TSAN_INTERCEPT(pthread_barrier_init); TSAN_INTERCEPT(pthread_barrier_destroy); |
