Skip to content

Commit

Permalink
deps: V8: cherry-pick bdcda72cd1d8
Browse files Browse the repository at this point in the history
Original commit message:

    [platform] Fix compilation on 32-bit Windows

    Use `extern "C"` to declare the __readfsdword function.
    Fixes error C2732 in the Node.js CI.

    Bug: chromium:796644
    Change-Id: If261985e65bfdade53ce06ff28afe0e2db402f7a
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3086457
    Reviewed-by: Clemens Backes <clemensb@chromium.org>
    Commit-Queue: Michaël Zasso <mic.besace@gmail.com>
    Cr-Commit-Position: refs/heads/master@{#76259}

Refs: v8/v8@bdcda72

Backport-PR-URL: nodejs#40285
PR-URL: nodejs#39945
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
targos committed Oct 4, 2021
1 parent 807b68b commit 150d816
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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.8',
'v8_embedder_string': '-node.9',

##### V8 defaults for Node.js #####

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/base/platform/platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
// And, intrin.h is a very expensive header that we want to avoid here, and
// the cheaper intrin0.h is not available for all build configurations. That is
// why we declare this intrinsic.
unsigned long __readfsdword(unsigned long); // NOLINT(runtime/int)
extern "C" unsigned long __readfsdword(unsigned long); // NOLINT(runtime/int)
#endif // V8_CC_MSVC && V8_HOST_ARCH_IA32
#endif // V8_NO_FAST_TLS

Expand Down

0 comments on commit 150d816

Please sign in to comment.