tools: disable trap handler for Windows cross-compiler · nodejs/node@520e5d9 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 633
• Pull requests 759
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 520e5d9

Browse filesBrowse the repository at this point in the historyBrowse files

targos

authored and

juanarbol

committed

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
Copy full SHA for 520e5d9

1 file changed

+6-3Lines changed: 6 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tools/v8_gypfiles
  • v8.gyp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tools/v8_gypfiles/v8.gyp‎

Copy file name to clipboardExpand all lines: tools/v8_gypfiles/v8.gyp

+6-3Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -607,7 +607,8 @@
607	607	'<(V8_ROOT)/src/trap-handler/handler-inside-posix.h',
608	608	],
609	609	}],
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)', {
611	612	'sources': [
612	613	'<(V8_ROOT)/src/trap-handler/trap-handler-simulator.h',
613	614	],
@@ -827,13 +828,15 @@
827	828	'<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',
828	829	],
829	830	}],
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', {
831	833	'sources': [
832	834	'<(V8_ROOT)/src/trap-handler/handler-inside-win.cc',
833	835	'<(V8_ROOT)/src/trap-handler/handler-outside-win.cc',
834	836	],
835	837	}],
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)', {
837	840	'sources': [
838	841	'<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc',
839	842	],

0 commit comments

Comments

0 (0)