From 37c9828d39340083cc2813297057176e122bf9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 20 Oct 2021 14:37:54 +0200 Subject: [PATCH] deps: disable trap handler for Windows cross-compiler `handler-outside-simulator.cc` uses inline assembly, which is not supported by MSVC. PR-URL: https://github.com/nodejs/node/pull/40488 Reviewed-By: Jiawen Geng Reviewed-By: James M Snell --- common.gypi | 2 +- deps/v8/src/trap-handler/trap-handler.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 89f82b509b7a48..e14b10cbe78863 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.7', + 'v8_embedder_string': '-node.8', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/trap-handler/trap-handler.h b/deps/v8/src/trap-handler/trap-handler.h index 79ddf566534565..d83f88ebb961a4 100644 --- a/deps/v8/src/trap-handler/trap-handler.h +++ b/deps/v8/src/trap-handler/trap-handler.h @@ -27,7 +27,7 @@ namespace trap_handler { #define V8_TRAP_HANDLER_SUPPORTED true // Arm64 simulator on x64 on Linux, Mac, or Windows. #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_X64 && \ - (V8_OS_LINUX || V8_OS_MACOSX || V8_OS_WIN) + (V8_OS_LINUX || V8_OS_MACOSX) #define V8_TRAP_HANDLER_VIA_SIMULATOR #define V8_TRAP_HANDLER_SUPPORTED true // Everything else is unsupported.