mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 11:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

std: Properly fix the TLS alignment problem

Browse Source 
ad05509 introduced a fix for the wrong problem, the logic to align the
start of main_thread_tls_buffer was already there but was flawed.

Fix it for good and avoid wasting too many bytes for alignment purposes.
This commit is contained in:
LemonBoy 2020-12-18 09:15:17 +01:00 committed by Andrew Kelley
parent ad05509930
commit ce65533985
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/os/linux/tls.zig
View File

@ -327,7 +327,7 @@ pub fn prepareTLS(area: []u8) usize {
if (tls_tp_points_past_tcb) tls_image.data_offset else tls_image.tcb_offset; if (tls_tp_points_past_tcb) tls_image.data_offset else tls_image.tcb_offset;
} }
var main_thread_tls_buffer: [256]u8 align(16) = undefined; var main_thread_tls_buffer: [256]u8 = undefined;
pub fn initStaticTLS() void { pub fn initStaticTLS() void {
initTLS(); initTLS();
@ -351,7 +351,9 @@ pub fn initStaticTLS() void {
}; };
// Make sure the slice is correctly aligned // Make sure the slice is correctly aligned
const start = @ptrToInt(alloc_tls_area.ptr) & (tls_image.alloc_align - 1); const begin_addr = @ptrToInt(alloc_tls_area.ptr);
const begin_aligned_addr = mem.alignForward(begin_addr, tls_image.alloc_align);
const start = begin_aligned_addr - begin_addr;
const tls_area = alloc_tls_area[start .. start + tls_image.alloc_size]; const tls_area = alloc_tls_area[start .. start + tls_image.alloc_size];
const tp_value = prepareTLS(tls_area); const tp_value = prepareTLS(tls_area);