Skip to content

Commit 5d5fe11

Browse files
authored
[compiler-rt][TSan] Fix compilation error on Android x86 (#162385)
1 parent 5deb787 commit 5d5fe11

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ void InitializePlatform() {
415415
// is not compiled with -pie.
416416
#if !SANITIZER_GO
417417
{
418-
# if SANITIZER_LINUX && (defined(__aarch64__) || defined(__loongarch_lp64))
418+
# if INIT_LONGJMP_XOR_KEY
419419
// Initialize the xor key used in {sig}{set,long}jump.
420420
InitializeLongjmpXorKey();
421421
# endif
@@ -486,7 +486,7 @@ int ExtractRecvmsgFDs(void *msgp, int *fds, int nfd) {
486486

487487
// Reverse operation of libc stack pointer mangling
488488
static uptr UnmangleLongJmpSp(uptr mangled_sp) {
489-
# if SANITIZER_ANDROID
489+
# if SANITIZER_ANDROID && INIT_LONGJMP_XOR_KEY
490490
if (longjmp_xor_key == 0) {
491491
// bionic libc initialization process: __libc_init_globals ->
492492
// __libc_init_vdso (calls strcmp) -> __libc_init_setjmp_cookie. strcmp is

0 commit comments

Comments
 (0)