You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

29 lines
1.2 KiB

  1. --- a/deps/v8/src/trap-handler/trap-handler.h
  2. +++ b/deps/v8/src/trap-handler/trap-handler.h
  3. @@ -17,19 +17,16 @@ namespace v8 {
  4. namespace internal {
  5. namespace trap_handler {
  6. -// X64 on Linux, Windows, MacOS, FreeBSD.
  7. -#if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 && \
  8. - ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_MACOSX || \
  9. - V8_OS_FREEBSD)
  10. +#if V8_TARGET_ARCH_X64 && V8_OS_LINUX && !V8_OS_ANDROID
  11. #define V8_TRAP_HANDLER_SUPPORTED true
  12. -// Arm64 (non-simulator) on Mac.
  13. -#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_MACOSX
  14. +#elif V8_TARGET_ARCH_X64 && V8_OS_WIN
  15. #define V8_TRAP_HANDLER_SUPPORTED true
  16. -// Arm64 simulator on x64 on Linux or Mac.
  17. -#elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && (V8_OS_LINUX || V8_OS_MACOSX)
  18. -#define V8_TRAP_HANDLER_VIA_SIMULATOR
  19. +#elif V8_TARGET_ARCH_X64 && V8_OS_MACOSX
  20. +#define V8_TRAP_HANDLER_SUPPORTED true
  21. +#elif V8_TARGET_ARCH_X64 && V8_OS_FREEBSD
  22. +#define V8_TRAP_HANDLER_SUPPORTED true
  23. +#elif V8_HOST_ARCH_ARM64 && V8_TARGET_ARCH_ARM64 && V8_OS_MACOSX
  24. #define V8_TRAP_HANDLER_SUPPORTED true
  25. -// Everything else is unsupported.
  26. #else
  27. #define V8_TRAP_HANDLER_SUPPORTED false
  28. #endif