diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-04-26 14:32:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 14:32:45 -0400 |
| commit | 528a83dd6b0d73e450fca9594846fde233aa2e7a (patch) | |
| tree | 1ac352741ee6433a8941f1ad090b1dab40e079c3 /lib/std/os/linux | |
| parent | ddf9ff79bd2eccadafcdf12b191c62c66b247b64 (diff) | |
| parent | dc29d866490e9d886f838e23cb085a9e28c0143b (diff) | |
| download | zig-528a83dd6b0d73e450fca9594846fde233aa2e7a.tar.gz zig-528a83dd6b0d73e450fca9594846fde233aa2e7a.zip | |
Merge pull request #8618 from LemonBoy/mini-stuff
Two small patches
Diffstat (limited to 'lib/std/os/linux')
| -rw-r--r-- | lib/std/os/linux/tls.zig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/std/os/linux/tls.zig b/lib/std/os/linux/tls.zig index 757e77bff3..4a36b0d485 100644 --- a/lib/std/os/linux/tls.zig +++ b/lib/std/os/linux/tls.zig @@ -248,7 +248,7 @@ fn initTLS() void { tls_data = @intToPtr([*]u8, img_base + phdr.p_vaddr)[0..phdr.p_filesz]; tls_data_alloc_size = phdr.p_memsz; } else { - tls_align_factor = @alignOf(*usize); + tls_align_factor = @alignOf(usize); tls_data = &[_]u8{}; tls_data_alloc_size = 0; } @@ -308,7 +308,7 @@ fn initTLS() void { } fn alignPtrCast(comptime T: type, ptr: [*]u8) callconv(.Inline) *T { - return @ptrCast(*T, @alignCast(@alignOf(*T), ptr)); + return @ptrCast(*T, @alignCast(@alignOf(T), ptr)); } /// Initializes all the fields of the static TLS area and returns the computed |