diff options
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/ubsan/ubsan_signals_standalone.cc | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h index 897aeddca4e..1b802703f9c 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h @@ -389,7 +389,7 @@ #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC) #define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID #define SANITIZER_INTERCEPT_WCSCAT SI_POSIX -#define SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION (!SI_WINDOWS) +#define SANITIZER_INTERCEPT_SIGNAL_AND_SIGACTION (!SI_WINDOWS && SI_NOT_FUCHSIA) #define SANITIZER_INTERCEPT_BSD_SIGNAL SI_ANDROID #endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H diff --git a/compiler-rt/lib/ubsan/ubsan_signals_standalone.cc b/compiler-rt/lib/ubsan/ubsan_signals_standalone.cc index 37485726986..60527f85848 100644 --- a/compiler-rt/lib/ubsan/ubsan_signals_standalone.cc +++ b/compiler-rt/lib/ubsan/ubsan_signals_standalone.cc @@ -24,6 +24,9 @@ namespace __ubsan { +#if SANITIZER_FUCHSIA +void InitializeDeadlySignals() {} +#else static void OnStackUnwind(const SignalContext &sig, const void *, BufferedStackTrace *stack) { GetStackTraceWithPcBpAndContext(stack, kStackTraceMax, sig.pc, sig.bp, @@ -44,6 +47,7 @@ void InitializeDeadlySignals() { InitializeSignalInterceptors(); InstallDeadlySignalHandlers(&UBsanOnDeadlySignal); } +#endif } // namespace __ubsan |
