Skip to content

Commit 520e5d9

Browse files
targosjuanarbol
authored andcommitted
tools: disable trap handler for Windows cross-compiler
`handler-outside-simulator.cc` uses inline assembly, which is not supported by MSVC. PR-URL: #40488 Backport-PR-URL: #43247 Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 776d11a commit 520e5d9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tools/v8_gypfiles/v8.gyp

+6-3
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,8 @@
607607
'<(V8_ROOT)/src/trap-handler/handler-inside-posix.h',
608608
],
609609
}],
610-
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="win")', {
610+
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
611+
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or False)', {
611612
'sources': [
612613
'<(V8_ROOT)/src/trap-handler/trap-handler-simulator.h',
613614
],
@@ -827,13 +828,15 @@
827828
'<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',
828829
],
829830
}],
830-
['_toolset=="host" and host_arch=="x64" and OS=="win"', {
831+
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
832+
['_toolset=="host" and host_arch=="x64" and False', {
831833
'sources': [
832834
'<(V8_ROOT)/src/trap-handler/handler-inside-win.cc',
833835
'<(V8_ROOT)/src/trap-handler/handler-outside-win.cc',
834836
],
835837
}],
836-
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="win")', {
838+
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
839+
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or False)', {
837840
'sources': [
838841
'<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc',
839842
],

0 commit comments

Comments
 (0)