commit b523b9c8d4629267fbcde3781f33f133153f7da3
author Dmitry Vyukov <dvyukov@google.com> Thu Sep 19 23:44:51 2013 +0000
committer Dmitry Vyukov <dvyukov@google.com> Thu Sep 19 23:44:51 2013 +0000
tree 6b61835263cbf97bf16fbbab25ce62a5b940b711
parent ac30f9e8da03e29dc20ab52386c428318de8cca2

tsan: fix linking of tsan runtime into dynamic libraries
versioned symbols can not be linked into dynamic library w/o linker script
also simplifies code as side effect

llvm-svn: 191056

compiler-rt/lib/interception/interception_linux.h

diff --git a/compiler-rt/lib/interception/interception_linux.h b/compiler-rt/lib/interception/interception_linux.h
index 5e0ec2a..8f7a706 100644
--- a/compiler-rt/lib/interception/interception_linux.h
+++ b/compiler-rt/lib/interception/interception_linux.h
@@ -35,9 +35,8 @@
           (::__interception::uptr)&WRAP(func))
 
 #if !defined(__ANDROID__)  // android does not have dlvsym
-#define INTERCEPT_FUNCTION_VER(func, funcver, symver) \
-    __asm__(".symver "#funcver","#func"@@"#symver); \
-    ::__interception::real_##funcver = (funcver##_f)(unsigned long) \
+#define INTERCEPT_FUNCTION_VER(func, symver) \
+    ::__interception::real_##func = (func##_f)(unsigned long) \
         ::__interception::GetFuncAddrVer(#func, #symver)
 #endif  // !defined(__ANDROID__)