Skip to content

Commit 86d1998

Browse files
sam-githubtargos
authored andcommitted
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 <[email protected]> Reviewed-by: Clemens Backes <[email protected]> Commit-Queue: Milad Farazmand <[email protected]> Cr-Commit-Position: refs/heads/master@{#65392} Refs: v8/v8@d406bfd PR-URL: #30819 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 9c9138f commit 86d1998

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
# Reset this number to 0 on major V8 upgrades.
4040
# Increment by one for each non-official patch applied to deps/v8.
41-
'v8_embedder_string': '-node.25',
41+
'v8_embedder_string': '-node.26',
4242

4343
##### V8 defaults for Node.js #####
4444

deps/v8/src/base/platform/time.cc

+3
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ V8_INLINE int64_t ClockNow(clockid_t clk_id) {
7070
#if defined(V8_OS_AIX)
7171
thread_cputime_t tc;
7272
if (clk_id == CLOCK_THREAD_CPUTIME_ID) {
73+
#if defined(__PASE__) // CLOCK_THREAD_CPUTIME_ID clock not supported on IBMi
74+
return 0;
75+
#endif
7376
if (thread_cputime(-1, &tc) != 0) {
7477
UNREACHABLE();
7578
}

0 commit comments

Comments
 (0)