diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2019-12-09 20:45:30 +0300 |
|---|---|---|
| committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-12-26 01:17:52 +0300 |
| commit | bbc032d395f221e8b88dc7ebde653e11d8411dde (patch) | |
| tree | 852f655eebca400551a8c0e4bbc5a47468cbbe0f /deps | |
| parent | 262c66a8517c150354b4babce890ccae4b08bf94 (diff) | |
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 <jyan@ca.ibm.com>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Commit-Queue: Milad Farazmand <miladfar@ca.ibm.com>
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 <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/src/base/platform/time.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/deps/v8/src/base/platform/time.cc b/deps/v8/src/base/platform/time.cc index ecbd70fd743..f07fd8e595f 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(); } |