diff options
| author | Andrea Orru <andrea@orru.io> | 2018-03-10 16:59:28 -0800 |
|---|---|---|
| committer | Andrea Orru <andrea@orru.io> | 2018-03-10 16:59:28 -0800 |
| commit | d0621391bc8acccfa214dfeac0d5be2f90c1ab8e (patch) | |
| tree | ca9051ebd159bb70c11382a7b46b61c0b8ac3477 | |
| parent | 10fb1f2730cb2d1760233622e232b35d21d651ea (diff) | |
| download | zig-d0621391bc8acccfa214dfeac0d5be2f90c1ab8e.tar.gz zig-d0621391bc8acccfa214dfeac0d5be2f90c1ab8e.zip | |
zen-specific: main -> _start
| -rw-r--r-- | src/link.cpp | 2 | ||||
| -rw-r--r-- | std/special/bootstrap.zig | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/link.cpp b/src/link.cpp index 4396a0daa6..f0537ffa0f 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -337,7 +337,7 @@ static void construct_linker_job_elf(LinkJob *lj) { if (g->zig_target.os == OsZen) { lj->args.append("-e"); - lj->args.append("main"); + lj->args.append("_start"); lj->args.append("--image-base=0x10000000"); } diff --git a/std/special/bootstrap.zig b/std/special/bootstrap.zig index f5754638b0..ad4d4891ed 100644 --- a/std/special/bootstrap.zig +++ b/std/special/bootstrap.zig @@ -11,17 +11,17 @@ comptime { const strong_linkage = builtin.GlobalLinkage.Strong; if (builtin.link_libc) { @export("main", main, strong_linkage); - } else if (builtin.os == builtin.Os.zen) { - @export("main", zenMain, strong_linkage); } else if (builtin.os == builtin.Os.windows) { @export("WinMainCRTStartup", WinMainCRTStartup, strong_linkage); + } else if (builtin.os == builtin.Os.zen) { + @export("_start", zen_start, strong_linkage); } else { @export("_start", _start, strong_linkage); } } -extern fn zenMain() noreturn { - std.os.posix.exit(callMain()); +extern fn zen_start() noreturn { + std.os.posix.exit(@inlineCall(callMain)); } nakedcc fn _start() noreturn { |