From fb773ba7b6cdb175fca2de8323480c9965660e50 Mon Sep 17 00:00:00 2001 From: Evgeny Karpov Date: Mon, 16 Jan 2023 15:53:00 +0100 Subject: [PATCH 1/2] * fix arm64 compilation --- .../snapshot/embedded/platform-embedded-file-writer-base.h | 2 ++ deps/v8/src/snapshot/mksnapshot.cc | 1 + tools/gyp/pylib/gyp/generator/msvs.py | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h index 4f7b98a4bedb61..bae2d5ac71ed9b 100644 --- a/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h +++ b/deps/v8/src/snapshot/embedded/platform-embedded-file-writer-base.h @@ -5,6 +5,8 @@ #ifndef V8_SNAPSHOT_EMBEDDED_PLATFORM_EMBEDDED_FILE_WRITER_BASE_H_ #define V8_SNAPSHOT_EMBEDDED_PLATFORM_EMBEDDED_FILE_WRITER_BASE_H_ +#include "src/objects/fixed-array-inl.h" + #include #include // For FILE. #include diff --git a/deps/v8/src/snapshot/mksnapshot.cc b/deps/v8/src/snapshot/mksnapshot.cc index dd679696947651..35c32da35bcbc3 100644 --- a/deps/v8/src/snapshot/mksnapshot.cc +++ b/deps/v8/src/snapshot/mksnapshot.cc @@ -18,6 +18,7 @@ #include "src/flags/flags.h" #include "src/snapshot/embedded/embedded-file-writer.h" #include "src/snapshot/snapshot.h" +#include "src/objects/fixed-array-inl.h" namespace { diff --git a/tools/gyp/pylib/gyp/generator/msvs.py b/tools/gyp/pylib/gyp/generator/msvs.py index fd950057847980..04cb52a87ab410 100644 --- a/tools/gyp/pylib/gyp/generator/msvs.py +++ b/tools/gyp/pylib/gyp/generator/msvs.py @@ -3633,7 +3633,10 @@ def _AddSources2( elif file_name.startswith("$("): file_name = re.sub(r"^\$\([^)]+\)\\", "", file_name) detail.append(["ObjectFileName", "$(IntDir)\\" + file_name]) - grouped_sources[group].append([element, {"Include": source}] + detail) + element_node = [element, {"Include": source}] + if element == "MARMASM": + element_node.append(["PreprocessedFileName", source + ".pp"]) + grouped_sources[group].append(element_node + detail) def _GetMSBuildProjectReferences(project): From 6ab9a0c845e0b69263e4c6ebeb9f974591dd6272 Mon Sep 17 00:00:00 2001 From: Evgeny Karpov Date: Tue, 17 Jan 2023 10:36:26 +0100 Subject: [PATCH 2/2] * keep the headers in the alphabetical order --- deps/v8/src/snapshot/mksnapshot.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/v8/src/snapshot/mksnapshot.cc b/deps/v8/src/snapshot/mksnapshot.cc index 35c32da35bcbc3..c08f5e194ed370 100644 --- a/deps/v8/src/snapshot/mksnapshot.cc +++ b/deps/v8/src/snapshot/mksnapshot.cc @@ -16,9 +16,9 @@ #include "src/base/vector.h" #include "src/codegen/cpu-features.h" #include "src/flags/flags.h" +#include "src/objects/fixed-array-inl.h" #include "src/snapshot/embedded/embedded-file-writer.h" #include "src/snapshot/snapshot.h" -#include "src/objects/fixed-array-inl.h" namespace {