diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2024-06-16 00:55:01 +0200 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2024-06-16 23:11:08 -0400 |
| commit | c533233f4211f353ca532da48132ee4069ba2841 (patch) | |
| tree | 0e4f51f94fd97b8b5dfdcc1dfe04a0c59648df97 /lib/std/start.zig | |
| parent | 96501d338550f47671692c669cb76eb99513a8da (diff) | |
| download | zig-c533233f4211f353ca532da48132ee4069ba2841.tar.gz zig-c533233f4211f353ca532da48132ee4069ba2841.zip | |
Revert "start: workaround for LLVM 17 regression"
This reverts commit d7daf7c203f583ed440efc68df6ee690ee8f8f32.
This is no longer needed with the LLVM 18 upgrade, and it was breaking PIE.
Closes #20306.
Diffstat (limited to 'lib/std/start.zig')
| -rw-r--r-- | lib/std/start.zig | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/std/start.zig b/lib/std/start.zig index ff97e3c8ae..187048dfd3 100644 --- a/lib/std/start.zig +++ b/lib/std/start.zig @@ -255,14 +255,6 @@ fn _start() callconv(.Naked) noreturn { : [tos] "={rax}" (-> *std.os.plan9.Tos), ); } - switch (native_arch) { - // https://github.com/ziglang/zig/issues/16799 - .riscv64 => @export(argc_argv_ptr, .{ - .name = "__zig_argc_argv_ptr", - .visibility = .hidden, - }), - else => {}, - } asm volatile (switch (native_arch) { .x86_64 => \\ xorl %%ebp, %%ebp @@ -293,8 +285,7 @@ fn _start() callconv(.Naked) noreturn { .riscv64 => \\ li s0, 0 \\ li ra, 0 - \\ lui a0, %hi(__zig_argc_argv_ptr) - \\ sd sp, %lo(__zig_argc_argv_ptr)(a0) + \\ sd sp, %[argc_argv_ptr] \\ andi sp, sp, -16 \\ tail %[posixCallMainAndExit]@plt , |