Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

std.os.linux.tls: Refactor, improve documentation, fix a bug, and port to more architectures #20857

Merged
merged 8 commits into from
Aug 1, 2024
Merged

std.os.linux.tls: Refactor, improve documentation, fix a bug, and port to more architectures #20857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b52e054
std.os.linux.tls: Refactor and improve documentation.
alexrp Jul 22, 2024
37275c0
std.os.linux.tls: Fix layout computation for the modified Variant I.
alexrp Jul 29, 2024
44d4656
std.os.linux.tls: Add m68k support.
alexrp Jul 23, 2024
9db992b
std.os.linux.tls: Add loongarch support.
alexrp Jul 23, 2024
d2b21d5
std.os.linux.tls: Add s390x support.
alexrp Jul 28, 2024
e6fe7a3
std.os.linux.tls: Add hexagon support.
alexrp Jul 28, 2024
9abe3ae
std.os.linux.tls: Add arc support.
alexrp Jul 28, 2024
36332a4
std.os.linux.tls: Add csky support.
alexrp Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/std/Thread.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,9 +1261,9 @@ const LinuxThreadImpl = struct {
bytes = std.mem.alignForward(usize, bytes, page_size);
stack_offset = bytes;

bytes = std.mem.alignForward(usize, bytes, linux.tls.tls_image.alloc_align);
bytes = std.mem.alignForward(usize, bytes, linux.tls.area_desc.alignment);
tls_offset = bytes;
bytes += linux.tls.tls_image.alloc_size;
bytes += linux.tls.area_desc.size;

bytes = std.mem.alignForward(usize, bytes, @alignOf(Instance));
instance_offset = bytes;
Expand Down Expand Up @@ -1304,12 +1304,12 @@ const LinuxThreadImpl = struct {
};

// Prepare the TLS segment and prepare a user_desc struct when needed on x86
var tls_ptr = linux.tls.prepareTLS(mapped[tls_offset..]);
var tls_ptr = linux.tls.prepareArea(mapped[tls_offset..]);
var user_desc: if (target.cpu.arch == .x86) linux.user_desc else void = undefined;
if (target.cpu.arch == .x86) {
defer tls_ptr = @intFromPtr(&user_desc);
user_desc = .{
.entry_number = linux.tls.tls_image.gdt_entry_number,
.entry_number = linux.tls.area_desc.gdt_entry_number,
.base_addr = tls_ptr,
.limit = 0xfffff,
.flags = .{
Expand Down
Loading