From 7fe8399e080c0f8505f8562758c2cf57a9bf92c4 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Mon, 9 Dec 2019 09:45:30 -0800 Subject: [PATCH] deps: V8: cherry-pick d406bfd64653 Original commit message: [base] Fix the return of ClockNow on IBMi The API thread_cputime() is only defined but not yet implemented on IBMi. Change-Id: I8ea7ff724e749f537b54e75a00d718500807ca8a Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1957831 Reviewed-by: Junliang Yan Reviewed-by: Clemens Backes Commit-Queue: Milad Farazmand Cr-Commit-Position: refs/heads/master@{#65392} Refs: https://github.com/v8/v8/commit/d406bfd64653a57d973007c4aec4cf1a49415809 PR-URL: https://github.com/nodejs/node/pull/30819 Reviewed-By: Anna Henningsen Reviewed-By: James M Snell Reviewed-By: Ruben Bridgewater --- common.gypi | 2 +- deps/v8/src/base/platform/time.cc | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 008ac88929f390..758d6eba189736 100644 --- a/common.gypi +++ b/common.gypi @@ -39,7 +39,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.24', + 'v8_embedder_string': '-node.25', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/base/platform/time.cc b/deps/v8/src/base/platform/time.cc index ecbd70fd743387..f07fd8e595fc60 100644 --- a/deps/v8/src/base/platform/time.cc +++ b/deps/v8/src/base/platform/time.cc @@ -70,6 +70,9 @@ V8_INLINE int64_t ClockNow(clockid_t clk_id) { #if defined(V8_OS_AIX) thread_cputime_t tc; if (clk_id == CLOCK_THREAD_CPUTIME_ID) { +#if defined(__PASE__) // CLOCK_THREAD_CPUTIME_ID clock not supported on IBMi + return 0; +#endif if (thread_cputime(-1, &tc) != 0) { UNREACHABLE(); }