Commit 76eaf24
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: v8/v8@d406bfd
PR-URL: #30819
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>1 parent c7dafd8 commit 76eaf24
2 files changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.25', | ||
| 41 | + 'v8_embedder_string': '-node.26', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -70,6 +70,9 @@ V8_INLINE int64_t ClockNow(clockid_t clk_id) { | |||
| 70 | 70 | #if defined(V8_OS_AIX) | |
| 71 | 71 | thread_cputime_t tc; | |
| 72 | 72 | 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 | ||
| 73 | 76 | if (thread_cputime(-1, &tc) != 0) { | |
| 74 | 77 | UNREACHABLE(); | |
| 75 | 78 | } | |
0 commit comments