Commit 273822f
deps: cherry-pick e020aae394 from V8 upstream
Original commit message:
Work around glibc thread-local storage bug
glibc before 2.17 has a bug that makes it impossible to execute
binaries that have single-byte thread-local variables:
% node --version
node: error while loading shared libraries: cannot allocate
memory in static TLS block
Work around that by making the one instance in the V8 code base
an int.
See: https://sourceware.org/bugzilla/show_bug.cgi?id=14898
See: nodesource/distributions#513
See: nodejs/build#809
Change-Id: Iefd8009100cd93e26cf8dc5dc03f2d622b423385
Reviewed-on: https://chromium-review.googlesource.com/612351
Commit-Queue: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-by: Eric Holk <eholk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#47400}
Backport-PR-URL: #15393
PR-URL: #14913
Ref: nodejs/build#809
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Nikolai Vavilov <vvnicholas@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent d85283b commit 273822f
2 files changed
Lines changed: 9 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -23,7 +23,14 @@ namespace v8 { | |||
| 23 | 23 | namespace internal { | |
| 24 | 24 | namespace trap_handler { | |
| 25 | 25 | ||
| 26 | - THREAD_LOCAL bool g_thread_in_wasm_code = false; | ||
| 26 | + // We declare this as int rather than bool as a workaround for a glibc bug, in | ||
| 27 | + // which the dynamic loader cannot handle executables whose TLS area is only | ||
| 28 | + // 1 byte in size; see https://sourceware.org/bugzilla/show_bug.cgi?id=14898. | ||
| 29 | + THREAD_LOCAL int g_thread_in_wasm_code = false; | ||
| 30 | + | ||
| 31 | + static_assert(sizeof(g_thread_in_wasm_code) > 1, | ||
| 32 | + "sizeof(thread_local_var) must be > 1, see " | ||
| 33 | + "https://sourceware.org/bugzilla/show_bug.cgi?id=14898"); | ||
| 27 | 34 | ||
| 28 | 35 | size_t gNumCodeObjects = 0; | |
| 29 | 36 | CodeProtectionInfoListEntry* gCodeObjects = nullptr; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -65,7 +65,7 @@ inline bool UseTrapHandler() { | |||
| 65 | 65 | return FLAG_wasm_trap_handler && V8_TRAP_HANDLER_SUPPORTED; | |
| 66 | 66 | } | |
| 67 | 67 | ||
| 68 | - extern THREAD_LOCAL bool g_thread_in_wasm_code; | ||
| 68 | + extern THREAD_LOCAL int g_thread_in_wasm_code; | ||
| 69 | 69 | ||
| 70 | 70 | inline bool IsThreadInWasm() { return g_thread_in_wasm_code; } | |
| 71 | 71 | ||
0 commit comments