maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[TSan] Move DECLARE_REAL macro outside of namespace 

This should fix the "undefined reference to
tsan::interception::real_setjmp" linker errors.

llvm-svn: 365806
This commit is contained in:
Julian Lettner 2019-07-11 18:26:33 +00:00
parent 9512c0a1d1
commit 9d41429ff7
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc
View File

@ -72,9 +72,21 @@ __tsan::uptr InitializeGuardPtr() __attribute__((visibility("hidden")));
extern "C" __tsan::uptr _tsan_pointer_chk_guard; extern "C" __tsan::uptr _tsan_pointer_chk_guard;
#endif #endif
#if SANITIZER_LINUX && defined(__aarch64__) && !SANITIZER_GO
# define INIT_LONGJMP_XOR_KEY 1
#else
# define INIT_LONGJMP_XOR_KEY 0
#endif
#if INIT_LONGJMP_XOR_KEY
#include "interception/interception.h"
// Must be declared outside of other namespaces.
DECLARE_REAL(int, _setjmp, void *env)
#endif
namespace __tsan { namespace __tsan {
#if SANITIZER_LINUX && defined(__aarch64__) && !SANITIZER_GO #if INIT_LONGJMP_XOR_KEY
static void InitializeLongjmpXorKey(); static void InitializeLongjmpXorKey();
static uptr longjmp_xor_key; static uptr longjmp_xor_key;
#endif #endif
@ -415,9 +427,7 @@ uptr ExtractLongJmpSp(uptr *env) {
return UnmangleLongJmpSp(mangled_sp); return UnmangleLongJmpSp(mangled_sp);
} }
#if SANITIZER_LINUX && defined(__aarch64__) #if INIT_LONGJMP_XOR_KEY
#include "interception/interception.h"
DECLARE_REAL(int, _setjmp, void* env)
// GLIBC mangles the function pointers in jmp_buf (used in {set,long}*jmp // GLIBC mangles the function pointers in jmp_buf (used in {set,long}*jmp
// functions) by XORing them with a random key. For AArch64 it is a global // functions) by XORing them with a random key. For AArch64 it is a global
// variable rather than a TCB one (as for x86_64/powerpc). We obtain the key by // variable rather than a TCB one (as for x86_64/powerpc). We obtain the key by
@ -425,7 +435,7 @@ DECLARE_REAL(int, _setjmp, void* env)
static void InitializeLongjmpXorKey() { static void InitializeLongjmpXorKey() {
// 1. Call REAL(setjmp), which stores the mangled SP in env. // 1. Call REAL(setjmp), which stores the mangled SP in env.
jmp_buf env; jmp_buf env;
// REAL(_setjmp)(env); // TODO(yln) REAL(_setjmp)(env);
// 2. Retrieve mangled/vanilla SP. // 2. Retrieve mangled/vanilla SP.
uptr mangled_sp = ((uptr *)&env)[LONG_JMP_SP_ENV_SLOT]; uptr mangled_sp = ((uptr *)&env)[LONG_JMP_SP_ENV_SLOT];