diff options
| author | Ryan Prichard <rprichard@google.com> | 2019-01-14 21:52:14 -0800 |
|---|---|---|
| committer | Ryan Prichard <rprichard@google.com> | 2019-01-16 15:54:52 -0800 |
| commit | 977e47d01897be06c2b5fc30267d29f86eeb5fc1 (patch) | |
| tree | b36bf217ddc383ed63ed343e497bf9096b9790db /linker/linker_tls.cpp | |
| parent | 05ca47512c94d919ba72862920985992a5ed2905 (diff) | |
StaticTlsLayout: add exe/tcb and solib layout
Replace reserve_tcb with reserve_exe_segment_and_tcb, which lays out both
the TCB and the executable's TLS segment, accounting for the difference in
layout between variant 1 and variant 2 targets.
The function isn't actually called with a non-null TlsSegment* yet.
Bug: http://b/78026329
Test: bionic unit tests
Change-Id: Ibd6238577423a7d0451f36da7e64912046959796
Diffstat (limited to 'linker/linker_tls.cpp')
| -rw-r--r-- | linker/linker_tls.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/linker_tls.cpp b/linker/linker_tls.cpp index 33274535c..c0ebf252c 100644 --- a/linker/linker_tls.cpp +++ b/linker/linker_tls.cpp @@ -41,7 +41,7 @@ extern "C" void __linker_reserve_bionic_tls_in_static_tls() { // Stub for linker static TLS layout. void layout_linker_static_tls() { StaticTlsLayout& layout = __libc_shared_globals()->static_tls_layout; - layout.reserve_tcb(); + layout.reserve_exe_segment_and_tcb(nullptr); // The pthread key data is located at the very front of bionic_tls. As a // temporary workaround, allocate bionic_tls just after the thread pointer so |