From 150d816edb0806058c4ceafc6bb23b1c2f686075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 31 Aug 2021 19:00:55 +0200 Subject: [PATCH] deps: V8: cherry-pick bdcda72cd1d8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [platform] Fix compilation on 32-bit Windows Use `extern "C"` to declare the __readfsdword function. Fixes error C2732 in the Node.js CI. Bug: chromium:796644 Change-Id: If261985e65bfdade53ce06ff28afe0e2db402f7a Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3086457 Reviewed-by: Clemens Backes Commit-Queue: Michaël Zasso Cr-Commit-Position: refs/heads/master@{#76259} Refs: https://github.com/v8/v8/commit/bdcda72cd1d8d9c37b03c4362ad97a570504bc0c Backport-PR-URL: https://github.com/nodejs/node/pull/40285 PR-URL: https://github.com/nodejs/node/pull/39945 Reviewed-By: Colin Ihrig Reviewed-By: Jiawen Geng Reviewed-By: Matteo Collina Reviewed-By: Michael Dawson --- common.gypi | 2 +- deps/v8/src/base/platform/platform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 2e5c76e9b85561..a4dba6841cab3b 100644 --- a/common.gypi +++ b/common.gypi @@ -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.8', + 'v8_embedder_string': '-node.9', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/base/platform/platform.h b/deps/v8/src/base/platform/platform.h index 6ad724db08e29a..d196578342f58b 100644 --- a/deps/v8/src/base/platform/platform.h +++ b/deps/v8/src/base/platform/platform.h @@ -47,7 +47,7 @@ // And, intrin.h is a very expensive header that we want to avoid here, and // the cheaper intrin0.h is not available for all build configurations. That is // why we declare this intrinsic. -unsigned long __readfsdword(unsigned long); // NOLINT(runtime/int) +extern "C" unsigned long __readfsdword(unsigned long); // NOLINT(runtime/int) #endif // V8_CC_MSVC && V8_HOST_ARCH_IA32 #endif // V8_NO_FAST_TLS