From 11e94b9987ffbccfff2adfe510e758dc4e418cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sat, 16 Sep 2023 10:13:14 +0200 Subject: [PATCH] deps: patch V8 to avoid duplicated zlib symbol PR-URL: https://github.com/nodejs/node/pull/49639 Reviewed-By: Jiawen Geng Reviewed-By: Rafael Gonzaga Reviewed-By: Antoine du Hamel PR-URL: https://github.com/nodejs/node/pull/52293 Reviewed-By: Moshe Atlow Reviewed-By: Richard Lau --- common.gypi | 2 +- deps/v8/third_party/zlib/chromeconf.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index d83cde6dfcde66..a5e5df78732e38 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.5', + 'v8_embedder_string': '-node.6', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/third_party/zlib/chromeconf.h b/deps/v8/third_party/zlib/chromeconf.h index 5b91c86442105a..c324e3259ac3f3 100644 --- a/deps/v8/third_party/zlib/chromeconf.h +++ b/deps/v8/third_party/zlib/chromeconf.h @@ -199,5 +199,6 @@ /* Symbols added by cpu_features.c */ #define cpu_check_features Cr_z_cpu_check_features #define x86_cpu_enable_sse2 Cr_z_x86_cpu_enable_sse2 +#define x86_cpu_enable_avx512 Cr_z_x86_cpu_enable_avx512 #endif /* THIRD_PARTY_ZLIB_CHROMECONF_H_ */