From e70c3090ff75e3ecdeed5a589f77ccb5e3087412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 15 Nov 2022 11:04:26 +0000 Subject: [PATCH] deps: V8: cherry-pick f1c888e7093e MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [base] Fix SmartOS build That platform doesn't have `malloc_usable_size`. Refs: https://github.com/nodejs/node-v8/issues/239 Change-Id: I011dd8449d02b27219a32cba00132cd068069f50 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4026402 Reviewed-by: Michael Lippautz Commit-Queue: Michaël Zasso Cr-Commit-Position: refs/heads/main@{#84256} Refs: https://github.com/v8/v8/commit/f1c888e7093eca98a5064a3d0c0c678959bee11d PR-URL: https://github.com/nodejs/node/pull/45230 Reviewed-By: Jiawen Geng Reviewed-By: Yagiz Nizipli --- common.gypi | 2 +- deps/v8/src/base/platform/memory.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common.gypi b/common.gypi index c8ecf1ffae8a9b..5bc3d8666abc85 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.5', + 'v8_embedder_string': '-node.6', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/base/platform/memory.h b/deps/v8/src/base/platform/memory.h index 0a68ee840f7734..b5c675ac238dbd 100644 --- a/deps/v8/src/base/platform/memory.h +++ b/deps/v8/src/base/platform/memory.h @@ -23,9 +23,9 @@ #include #endif // !V8_OS_DARWIN -#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN +#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 -#endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN +#endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN namespace v8::base {