diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2013-08-13 12:03:51 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2013-08-13 12:03:51 +0000 |
| commit | f109267c5320210e69c1b66add801fd5f2e2a452 (patch) | |
| tree | 68d9463fcbe2e1e30d8c37fb3d964bfd361248ef /lib/tsan/rtl/tsan_interceptors.cc | |
| parent | 3c80c6c574850106481f82b9e23d1c728458d4a9 (diff) | |
| download | compiler-rt-f109267c5320210e69c1b66add801fd5f2e2a452.tar.gz compiler-rt-f109267c5320210e69c1b66add801fd5f2e2a452.tar.bz2 compiler-rt-f109267c5320210e69c1b66add801fd5f2e2a452.tar.xz | |
[*San/RTL] Fix minor breakage
Grumbling: this hasn't been caught by running 'make check-{a,l,t}san check-sanitizer'
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@188262 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/tsan/rtl/tsan_interceptors.cc')
| -rw-r--r-- | lib/tsan/rtl/tsan_interceptors.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/tsan/rtl/tsan_interceptors.cc b/lib/tsan/rtl/tsan_interceptors.cc index 7a746f77..ad69de0e 100644 --- a/lib/tsan/rtl/tsan_interceptors.cc +++ b/lib/tsan/rtl/tsan_interceptors.cc @@ -362,35 +362,37 @@ static void LongJmp(ThreadState *thr, uptr *env) { CHECK(0); } +// FIXME: put everything below into a common extern "C" block? extern "C" void __tsan_setjmp(uptr sp, uptr mangled_sp) { ScopedInRtl in_rtl; SetJmp(cur_thread(), sp, mangled_sp); } // Not called. Merely to satisfy TSAN_INTERCEPT(). -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" int __interceptor_setjmp(void *env); +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +int __interceptor_setjmp(void *env); extern "C" int __interceptor_setjmp(void *env) { CHECK(0); return 0; } -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" int __interceptor__setjmp(void *env); +// FIXME: any reason to have a separate declaration? +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +int __interceptor__setjmp(void *env); extern "C" int __interceptor__setjmp(void *env) { CHECK(0); return 0; } -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" int __interceptor_sigsetjmp(void *env); +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +int __interceptor_sigsetjmp(void *env); extern "C" int __interceptor_sigsetjmp(void *env) { CHECK(0); return 0; } -SANITIZER_INTERFACE_ATTRIBUTE -extern "C" int __interceptor___sigsetjmp(void *env); +extern "C" SANITIZER_INTERFACE_ATTRIBUTE +int __interceptor___sigsetjmp(void *env); extern "C" int __interceptor___sigsetjmp(void *env) { CHECK(0); return 0; |