Index: lib/asan/tests/asan_test.cc =================================================================== --- lib/asan/tests/asan_test.cc +++ lib/asan/tests/asan_test.cc @@ -594,10 +594,7 @@ siglongjmp(buf, 1); } -#if !defined(__ANDROID__) && !defined(__arm__) && \ - !defined(__powerpc64__) && !defined(__powerpc__) && \ - !defined(__aarch64__) && !defined(__mips__) && \ - !defined(__mips64) +#if !defined(__ANDROID__) && (defined(__i386__) || defined(__x86_64__)) NOINLINE void BuiltinLongJmpFunc1(jmp_buf buf) { // create three red zones for these two stack objects. int a; @@ -619,9 +616,7 @@ TouchStackFunc(); } } -#endif // !defined(__ANDROID__) && !defined(__powerpc64__) && - // !defined(__powerpc__) && !defined(__arm__) && - // !defined(__mips__) && !defined(__mips64) +#endif // !defined(__ANDROID__) && (defined(__i386__) || defined(__x86_64__)) TEST(AddressSanitizer, UnderscopeLongJmpTest) { static jmp_buf buf;