Skip to content

Commit 69a443d

Browse files
StefanStojanovicnodejs-github-bot
authored andcommitted
deps: define V8_PRESERVE_MOST as no-op on Windows
It's causing linker errors with node.lib in node-gyp and potentially breaks other 3rd party tools PR-URL: nodejs/node#56238 Refs: nodejs/node#55784 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Paolo Insogna <[email protected]>
1 parent d726dc8 commit 69a443d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

common.gypi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.2',
41+
'v8_embedder_string': '-node.3',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/include/v8config.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,11 +600,15 @@ path. Add it with -I<path> to the command line
600600
// functions.
601601
// Use like:
602602
// V8_NOINLINE V8_PRESERVE_MOST void UnlikelyMethod();
603+
#if V8_OS_WIN
604+
# define V8_PRESERVE_MOST
605+
#else
603606
#if V8_HAS_ATTRIBUTE_PRESERVE_MOST
604607
# define V8_PRESERVE_MOST __attribute__((preserve_most))
605608
#else
606609
# define V8_PRESERVE_MOST /* NOT SUPPORTED */
607610
#endif
611+
#endif
608612

609613

610614
// A macro (V8_DEPRECATED) to mark classes or functions as deprecated.

0 commit comments

Comments
 (0)