authorgravatar for andrea@orru.ioAndrea Orru <andrea@orru.io> 2018-03-10 16:59:28-08:00
committergravatar for andrea@orru.ioAndrea Orru <andrea@orru.io> 2018-03-10 16:59:28-08:00
logd0621391bc8acccfa214dfeac0d5be2f90c1ab8e
treeca9051ebd159bb70c11382a7b46b61c0b8ac3477
parent10fb1f2730cb2d1760233622e232b35d21d651ea

zen-specific: main -> _start


2 files changed, 5 insertions(+), 5 deletions(-)

src/link.cpp+1-1
...@@ -337,7 +337,7 @@ static void construct_linker_job_elf(LinkJob *lj) {...@@ -337,7 +337,7 @@ static void construct_linker_job_elf(LinkJob *lj) {
337337
338 if (g->zig_target.os == OsZen) {338 if (g->zig_target.os == OsZen) {
339 lj->args.append("-e");339 lj->args.append("-e");
340 lj->args.append("main");340 lj->args.append("_start");
341341
342 lj->args.append("--image-base=0x10000000");342 lj->args.append("--image-base=0x10000000");
343 }343 }
std/special/bootstrap.zig+4-4
...@@ -11,17 +11,17 @@ comptime {...@@ -11,17 +11,17 @@ comptime {
11 const strong_linkage = builtin.GlobalLinkage.Strong;11 const strong_linkage = builtin.GlobalLinkage.Strong;
12 if (builtin.link_libc) {12 if (builtin.link_libc) {
13 @export("main", main, strong_linkage);13 @export("main", main, strong_linkage);
14 } else if (builtin.os == builtin.Os.zen) {
15 @export("main", zenMain, strong_linkage);
16 } else if (builtin.os == builtin.Os.windows) {14 } else if (builtin.os == builtin.Os.windows) {
17 @export("WinMainCRTStartup", WinMainCRTStartup, strong_linkage);15 @export("WinMainCRTStartup", WinMainCRTStartup, strong_linkage);
16 } else if (builtin.os == builtin.Os.zen) {
17 @export("_start", zen_start, strong_linkage);
18 } else {18 } else {
19 @export("_start", _start, strong_linkage);19 @export("_start", _start, strong_linkage);
20 }20 }
21}21}
2222
23extern fn zenMain() noreturn {23extern fn zen_start() noreturn {
24 std.os.posix.exit(callMain());24 std.os.posix.exit(@inlineCall(callMain));
25}25}
2626
27nakedcc fn _start() noreturn {27nakedcc fn _start() noreturn {