diff options
| author | dim <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2016-02-06 13:39:20 +0000 |
| commit | 9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2 (patch) | |
| tree | 4efb8604227ede935238eb1c67b626da1265d459 /contrib/compiler-rt/lib/interception/interception_linux.h | |
| parent | aef1771e36f9842a113b9905d0d5926fe9d694aa (diff) | |
| parent | 75958af7df18c2ae942829da1a8cf3b5bbcaeff6 (diff) | |
| download | FreeBSD-src-9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2.zip FreeBSD-src-9c27ec33f2c82fe6c60c9c375a88f96a1e10a6a2.tar.gz | |
Merge compiler-rt release_38 branch r258968.
Note that there is still a problem on amd64, causing SIGBUS in the early
startup of Address Sanitizer. This is being investigated.
Diffstat (limited to 'contrib/compiler-rt/lib/interception/interception_linux.h')
| -rw-r--r-- | contrib/compiler-rt/lib/interception/interception_linux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/compiler-rt/lib/interception/interception_linux.h b/contrib/compiler-rt/lib/interception/interception_linux.h index d3f774b..27a66c8 100644 --- a/contrib/compiler-rt/lib/interception/interception_linux.h +++ b/contrib/compiler-rt/lib/interception/interception_linux.h @@ -35,12 +35,12 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); (::__interception::uptr) & WRAP(func)) #if !defined(__ANDROID__) // android does not have dlvsym -# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ - ::__interception::real_##func = (func##_f)(unsigned long) \ - ::__interception::GetFuncAddrVer(#func, symver) +#define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) #else -# define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ - INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func) +#define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func) #endif // !defined(__ANDROID__) #endif // INTERCEPTION_LINUX_H |
