Commit cdeade3
deps: fix V8 8.3 on SmartOS
Backport-PR-URL: #33376
PR-URL: #32831
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent 883840b commit cdeade3
3 files changed
Lines changed: 21 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | 37 | # Reset this number to 0 on major V8 upgrades. | |
| 38 | 38 | # Increment by one for each non-official patch applied to deps/v8. | |
| 39 | - 'v8_embedder_string': '-node.8', | ||
| 39 | + 'v8_embedder_string': '-node.9', | ||
| 40 | 40 | ||
| 41 | 41 | ##### V8 defaults for Node.js ##### | |
| 42 | 42 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -970,7 +970,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* value) { | |||
| 970 | 970 | // pthread_getattr_np used below is non portable (hence the _np suffix). We | |
| 971 | 971 | // keep this version in POSIX as most Linux-compatible derivatives will | |
| 972 | 972 | // support it. MacOS and FreeBSD are different here. | |
| 973 | - #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_MACOSX) | ||
| 973 | + #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_MACOSX) && !defined(V8_OS_SOLARIS) | ||
| 974 | 974 | ||
| 975 | 975 | // static | |
| 976 | 976 | void* Stack::GetStackStart() { | |
@@ -996,7 +996,7 @@ void* Stack::GetStackStart() { | |||
| 996 | 996 | return nullptr; | |
| 997 | 997 | } | |
| 998 | 998 | ||
| 999 | - #endif // !defined(V8_OS_FREEBSD) && !defined(V8_OS_MACOSX) | ||
| 999 | + #endif // !defined(V8_OS_FREEBSD) && !defined(V8_OS_MACOSX) && !defined(V8_OS_SOLARIS) | ||
| 1000 | 1000 | ||
| 1001 | 1001 | // static | |
| 1002 | 1002 | void* Stack::GetCurrentStackPosition() { return __builtin_frame_address(0); } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -65,5 +65,23 @@ void OS::SignalCodeMovingGC() {} | |||
| 65 | 65 | ||
| 66 | 66 | void OS::AdjustSchedulingParams() {} | |
| 67 | 67 | ||
| 68 | + // static | ||
| 69 | + void* Stack::GetStackStart() { | ||
| 70 | + pthread_attr_t attr; | ||
| 71 | + int error; | ||
| 72 | + pthread_attr_init(&attr); | ||
| 73 | + error = pthread_attr_get_np(pthread_self(), &attr); | ||
| 74 | + if (!error) { | ||
| 75 | + void* base; | ||
| 76 | + size_t size; | ||
| 77 | + error = pthread_attr_getstack(&attr, &base, &size); | ||
| 78 | + CHECK(!error); | ||
| 79 | + pthread_attr_destroy(&attr); | ||
| 80 | + return reinterpret_cast<uint8_t*>(base) + size; | ||
| 81 | + } | ||
| 82 | + pthread_attr_destroy(&attr); | ||
| 83 | + return nullptr; | ||
| 84 | + } | ||
| 85 | + | ||
| 68 | 86 | } // namespace base | |
| 69 | 87 | } // namespace v8 | |
0 commit comments