Skip to content

Commit

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

    [arm64][msvc] fix arm64 build on msvc

    See: nodejs#35415 (comment)

    Co-authored-by: Richard Townsend <richard.townsend@arm.com>
    Change-Id: I440644f55dc8c8ec3108e5015ebbce2829dd8207
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2479602
    Reviewed-by: Jakob Gruber <jgruber@chromium.org>
    Commit-Queue: Jakob Gruber <jgruber@chromium.org>
    Auto-Submit: Jiawen Geng <technicalcute@gmail.com>
    Cr-Commit-Position: refs/heads/master@{#70648}

Refs: v8/v8@45e4977

PR-URL: nodejs#35700
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
  • Loading branch information
targos committed Nov 19, 2020
1 parent 6218c1c commit 685fbe2
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.13',
'v8_embedder_string': '-node.14',

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ void PlatformEmbeddedFileWriterWin::Comment(const char* string) {

void PlatformEmbeddedFileWriterWin::DeclareLabel(const char* name) {
if (target_arch_ == EmbeddedTargetArch::kArm64) {
fprintf(fp_, "%s%s\t", SYMBOL_PREFIX, name);
fprintf(fp_, "%s%s\n", SYMBOL_PREFIX, name);

} else {
fprintf(fp_, "%s%s LABEL %s\n", SYMBOL_PREFIX, name,
Expand Down

0 comments on commit 685fbe2

Please sign in to comment.