diff --git a/common.gypi b/common.gypi index 3b99d4a36e91d4..a36737086c2f2d 100644 --- a/common.gypi +++ b/common.gypi @@ -37,7 +37,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.0', + 'v8_embedder_string': '-node.1', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/snapshot/embedded-file-writer.cc b/deps/v8/src/snapshot/embedded-file-writer.cc index 36a5f0e88b5406..2a08d05170f177 100644 --- a/deps/v8/src/snapshot/embedded-file-writer.cc +++ b/deps/v8/src/snapshot/embedded-file-writer.cc @@ -561,13 +561,11 @@ void PlatformDependentEmbeddedFileWriter::AlignToCodeAlignment() { } void PlatformDependentEmbeddedFileWriter::AlignToDataAlignment() { -#if defined(V8_OS_WIN) && defined(V8_TARGET_ARCH_ARM64) - // On Windows ARM64, instruction "ldr xt,[xn,v8_Default_embedded_blob_]" is - // generated by clang-cl to load elements in v8_Default_embedded_blob_. - // The generated instruction has scale 3 which requires the load target to be - // aligned at 8 bytes (2^3). + // On Windows ARM64, s390, PPC and possibly more platforms, aligned load + // instructions are used to retrieve v8_Default_embedded_blob_ and/or + // v8_Default_embedded_blob_size_. The generated instructions require the + // load target to be aligned at 8 bytes (2^3). fprintf(fp_, ".balign 8\n"); -#endif } void PlatformDependentEmbeddedFileWriter::Comment(const char* string) { diff --git a/deps/v8/src/snapshot/embedded-file-writer.h b/deps/v8/src/snapshot/embedded-file-writer.h index 55e134cd47f61f..8323c4d53b7849 100644 --- a/deps/v8/src/snapshot/embedded-file-writer.h +++ b/deps/v8/src/snapshot/embedded-file-writer.h @@ -286,6 +286,7 @@ class EmbeddedFileWriter : public EmbeddedFileWriterInterface { w->Comment("The size of the embedded blob in bytes."); w->SectionRoData(); + w->AlignToDataAlignment(); w->DeclareUint32(embedded_blob_size_symbol, blob->size()); w->Newline(); }