Skip to content

Commit

Permalink
deps: V8: cherry-pick f1c888e7093e
Browse files Browse the repository at this point in the history
Original commit message:

    [base] Fix SmartOS build

    That platform doesn't have `malloc_usable_size`.

    Refs: nodejs/node-v8#239
    Change-Id: I011dd8449d02b27219a32cba00132cd068069f50
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4026402
    Reviewed-by: Michael Lippautz <[email protected]>
    Commit-Queue: Michaël Zasso <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#84256}

Refs: v8/v8@f1c888e
PR-URL: #45230
Reviewed-By: Jiawen Geng <[email protected]>
Reviewed-By: Yagiz Nizipli <[email protected]>

# Conflicts:
#	common.gypi
PR-URL: #45579
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
targos authored and nodejs-github-bot committed Nov 27, 2022
1 parent a624277 commit d6dae74
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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.4',
'v8_embedder_string': '-node.5',

##### V8 defaults for Node.js #####

Expand Down
4 changes: 2 additions & 2 deletions deps/v8/src/base/platform/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include <malloc.h>
#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 {

Expand Down

0 comments on commit d6dae74

Please sign in to comment.