From ab0ddd48647cc7081786567d328d23268cc41359 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 3 Sep 2013 10:16:44 +0000 Subject: tsan: fix linking when -ltsan is passed before -lpthread libpthread is weird: /lib/x86_64-linux-gnu/libpthread.so.0:000000000000b9b0 T pthread_cond_init@@GLIBC_2.3.2 /lib/x86_64-linux-gnu/libpthread.so.0:000000000000c720 T pthread_cond_init@GLIBC_2.2.5 let's do it with @@ for now we can always introduce more macros parameters later git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@189788 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/interception/interception_linux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/interception/interception_linux.h') diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h index 4c6f97a9d..5e0ec2acb 100644 --- a/lib/interception/interception_linux.h +++ b/lib/interception/interception_linux.h @@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); #if !defined(__ANDROID__) // android does not have dlvsym #define INTERCEPT_FUNCTION_VER(func, funcver, symver) \ - __asm__(".symver "#funcver","#func"@"#symver); \ + __asm__(".symver "#funcver","#func"@@"#symver); \ ::__interception::real_##funcver = (funcver##_f)(unsigned long) \ ::__interception::GetFuncAddrVer(#func, #symver) #endif // !defined(__ANDROID__) -- cgit v1.2.3