Skip to content

Commit

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

    Fix build with Windows 10 20348 SDK

    Bug: chromium:1292528
    Change-Id: If4da2ec92afb7b4fe9942778eca385344b9b6409
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3563539
    Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
    Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
    Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#79709}

Refs: v8/v8@ca2a787

PR-URL: #42657
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
targos committed Apr 12, 2022
1 parent 01cea9a commit a052c03
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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.9',
'v8_embedder_string': '-node.10',

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

Expand Down
6 changes: 4 additions & 2 deletions deps/v8/src/base/cpu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -764,9 +764,11 @@ CPU::CPU()
// user-space.
has_non_stop_time_stamp_counter_ = true;

// Defined in winnt.h, but in a newer version of the Windows SDK than the one
// that V8 requires, so we must copy the value here.
// Defined in winnt.h, but only in 10.0.20348.0 version of the Windows SDK.
// Copy the value here to support older versions as well.
#if !defined(PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE)
constexpr int PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE = 44;
#endif

has_jscvt_ =
IsProcessorFeaturePresent(PF_ARM_V83_JSCVT_INSTRUCTIONS_AVAILABLE);
Expand Down

0 comments on commit a052c03

Please sign in to comment.