From 4237f43cec0f0441bd43044a18ab72fc14e101c1 Mon Sep 17 00:00:00 2001 From: Milad Fa Date: Thu, 30 Oct 2025 21:34:02 +0000 Subject: [PATCH] deps: V8: backport 2e4c5cf9b112 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: remove ppc and s390 from the host_arch list We only support ppc64 and s390x. Same changes is applied to depot_tools: http://crrev.com/c/7100932 Change-Id: I1e4b660a1e46d1c609189301e8fd977fb7434748 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/7102361 Reviewed-by: Leszek Swirski Commit-Queue: Milad Farazmand Reviewed-by: Thibaud Michaud Cr-Commit-Position: refs/heads/main@{#103488} Refs: https://github.com/v8/v8/commit/2e4c5cf9b1125a25c1b9107c9d81fec2d77b1135 Fixes: https://github.com/nodejs/build/issues/4184 Co-authored-by: Michaël Zasso --- common.gypi | 2 +- deps/v8/DEPS | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.gypi b/common.gypi index 20acf954bc02d4..55476f5ce2b184 100644 --- a/common.gypi +++ b/common.gypi @@ -38,7 +38,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.10', + 'v8_embedder_string': '-node.11', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/DEPS b/deps/v8/DEPS index 7439281d9f41a0..debc22773a6733 100644 --- a/deps/v8/DEPS +++ b/deps/v8/DEPS @@ -141,7 +141,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'host_os == "linux" and host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc"', + 'condition': 'host_os == "linux" and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"', }, 'buildtools/mac': { 'packages': [ @@ -171,7 +171,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': '(host_os == "linux" or host_os == "mac" or host_os == "win") and host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc" and (host_cpu != "arm64" or host_os == "mac")', + 'condition': '(host_os == "linux" or host_os == "mac" or host_os == "win") and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64" and (host_cpu != "arm64" or host_os == "mac")', }, 'test/benchmarks/data': Var('chromium_url') + '/v8/deps/third_party/benchmarks.git' + '@' + '05d7188267b4560491ff9155c5ee13e207ecd65f', @@ -481,7 +481,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc"' + 'condition': 'host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"' }, 'third_party/partition_alloc': { 'url': Var('chromium_url') + '/chromium/src/base/allocator/partition_allocator.git@' + Var('partition_alloc_version'), @@ -545,7 +545,7 @@ deps = { } ], 'dep_type': 'cipd', - 'condition': 'not build_with_chromium and host_cpu != "s390" and host_os != "zos" and host_cpu != "ppc"', + 'condition': 'not build_with_chromium and host_cpu != "s390x" and host_os != "zos" and host_cpu != "ppc64"', }, 'third_party/zlib': Var('chromium_url') + '/chromium/src/third_party/zlib.git'+ '@' + '85f05b0835f934e52772efc308baa80cdd491838',