diff --git a/compiler-rt/test/tsan/Darwin/debug_external.cpp b/compiler-rt/test/tsan/Darwin/debug_external.cpp --- a/compiler-rt/test/tsan/Darwin/debug_external.cpp +++ b/compiler-rt/test/tsan/Darwin/debug_external.cpp @@ -42,10 +42,6 @@ return 0; } -// Required for dyld macOS 12.0+ -#if (__APPLE__) -__attribute__((weak)) -#endif __attribute__((disable_sanitizer_instrumentation)) extern "C" void __tsan_on_report(void *report) { diff --git a/compiler-rt/test/tsan/Darwin/main_tid.mm b/compiler-rt/test/tsan/Darwin/main_tid.mm --- a/compiler-rt/test/tsan/Darwin/main_tid.mm +++ b/compiler-rt/test/tsan/Darwin/main_tid.mm @@ -13,10 +13,6 @@ unsigned long trace_size); } -// Required for dyld macOS 12.0+ -#if (__APPLE__) -__attribute__((weak)) -#endif __attribute__((disable_sanitizer_instrumentation)) extern "C" void __tsan_on_report(void *report) { diff --git a/compiler-rt/test/tsan/cxa_guard_acquire.cpp b/compiler-rt/test/tsan/cxa_guard_acquire.cpp --- a/compiler-rt/test/tsan/cxa_guard_acquire.cpp +++ b/compiler-rt/test/tsan/cxa_guard_acquire.cpp @@ -5,16 +5,10 @@ namespace __tsan { -#if (__APPLE__) -__attribute__((weak)) -#endif void OnPotentiallyBlockingRegionBegin() { printf("Enter __cxa_guard_acquire\n"); } -#if (__APPLE__) -__attribute__((weak)) -#endif void OnPotentiallyBlockingRegionEnd() { printf("Exit __cxa_guard_acquire\n"); } } // namespace __tsan diff --git a/compiler-rt/test/tsan/debugging.cpp b/compiler-rt/test/tsan/debugging.cpp --- a/compiler-rt/test/tsan/debugging.cpp +++ b/compiler-rt/test/tsan/debugging.cpp @@ -46,10 +46,6 @@ fprintf(stderr, "Done.\n"); } -// Required for dyld macOS 12.0+ -#if (__APPLE__) -__attribute__((weak)) -#endif __attribute__((disable_sanitizer_instrumentation)) extern "C" void __tsan_on_report(void *report) { diff --git a/compiler-rt/test/tsan/default_options.cpp b/compiler-rt/test/tsan/default_options.cpp --- a/compiler-rt/test/tsan/default_options.cpp +++ b/compiler-rt/test/tsan/default_options.cpp @@ -3,9 +3,6 @@ #include #include -#if (__APPLE__) -__attribute__((weak)) -#endif extern "C" const char *__tsan_default_options() { return "report_bugs=0"; } diff --git a/compiler-rt/test/tsan/java_symbolization.cpp b/compiler-rt/test/tsan/java_symbolization.cpp --- a/compiler-rt/test/tsan/java_symbolization.cpp +++ b/compiler-rt/test/tsan/java_symbolization.cpp @@ -3,9 +3,6 @@ #include #include -#if (__APPLE__) -__attribute__((weak)) // Required for dyld macOS 12.0+ -#endif __attribute__((disable_sanitizer_instrumentation)) extern "C" void __tsan_symbolize_external_ex(jptr pc, diff --git a/compiler-rt/test/tsan/java_symbolization_legacy.cpp b/compiler-rt/test/tsan/java_symbolization_legacy.cpp --- a/compiler-rt/test/tsan/java_symbolization_legacy.cpp +++ b/compiler-rt/test/tsan/java_symbolization_legacy.cpp @@ -3,9 +3,6 @@ #include #include -#if (__APPLE__) -__attribute__((weak)) // Required for dyld macOS 12.0+ -#endif __attribute__((disable_sanitizer_instrumentation)) extern "C" bool __tsan_symbolize_external(jptr pc, char *func_buf, jptr func_siz,