Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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>
  • Loading branch information
targos authored and juanarbol committed Jun 1, 2022
commit feac215e4e811b30d4ca757c56331990db0d7d3f
9 changes: 6 additions & 3 deletions tools/v8_gypfiles/v8.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,8 @@
'<(V8_ROOT)/src/trap-handler/handler-inside-posix.h',
],
}],
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="win")', {
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or False)', {
'sources': [
'<(V8_ROOT)/src/trap-handler/trap-handler-simulator.h',
],
Expand Down Expand Up @@ -827,13 +828,15 @@
'<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',
],
}],
['_toolset=="host" and host_arch=="x64" and OS=="win"', {
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
['_toolset=="host" and host_arch=="x64" and False', {
'sources': [
'<(V8_ROOT)/src/trap-handler/handler-inside-win.cc',
'<(V8_ROOT)/src/trap-handler/handler-outside-win.cc',
],
}],
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or OS=="win")', {
# TODO(targos): Replace False with OS=="win" if handler-outside-simulator.cc becomes compatible with MSVC.
['_toolset=="host" and host_arch=="x64" and (OS=="linux" or OS=="mac" or False)', {
'sources': [
'<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc',
],
Expand Down