diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-06-12 13:42:21 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-06-12 13:42:21 -0400 |
| commit | 278c7a2bc398ac71afc9b9b392e863a758abb5fd (patch) | |
| tree | 3b2f9cfff73c26f8b5bafb1c6024eb728fd2617f /std | |
| parent | ce5d50e4ed519d23d7a467bdfee196093a3f5dc2 (diff) | |
| download | zig-278c7a2bc398ac71afc9b9b392e863a758abb5fd.tar.gz zig-278c7a2bc398ac71afc9b9b392e863a758abb5fd.zip | |
fix `@bitCast` regressions
Diffstat (limited to 'std')
| -rw-r--r-- | std/special/bootstrap.zig | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/std/special/bootstrap.zig b/std/special/bootstrap.zig index f1286bd659..20f2417972 100644 --- a/std/special/bootstrap.zig +++ b/std/special/bootstrap.zig @@ -78,19 +78,19 @@ fn posixCallMainAndExit() noreturn { while (envp_optional[envp_count]) |_| : (envp_count += 1) {} const envp = @ptrCast([*][*]u8, envp_optional)[0..envp_count]; - if (builtin.os == .linux) { - // Find the beginning of the auxiliary vector - const auxv = @ptrCast([*]std.elf.Auxv, envp.ptr + envp_count + 1); - std.os.linux.elf_aux_maybe = auxv; - // Initialize the TLS area - std.os.linux.tls.initTLS(); - - if (std.os.linux.tls.tls_image) |tls_img| { - const tls_addr = std.os.linux.tls.allocateTLS(tls_img.alloc_size); - const tp = std.os.linux.tls.copyTLS(tls_addr); - std.os.linux.tls.setThreadPointer(tp); - } - } + //if (builtin.os == .linux) { + // // Find the beginning of the auxiliary vector + // const auxv = @ptrCast([*]std.elf.Auxv, envp.ptr + envp_count + 1); + // std.os.linux.elf_aux_maybe = auxv; + // // Initialize the TLS area + // std.os.linux.tls.initTLS(); + + // if (std.os.linux.tls.tls_image) |tls_img| { + // const tls_addr = std.os.linux.tls.allocateTLS(tls_img.alloc_size); + // const tp = std.os.linux.tls.copyTLS(tls_addr); + // std.os.linux.tls.setThreadPointer(tp); + // } + //} std.os.exit(callMainWithArgs(argc, argv, envp)); } |