zig

commit d0621391bc8acccfa214dfeac0d5be2f90c1ab8e (tree)
parent 10fb1f2730cb2d1760233622e232b35d21d651ea
Author: Andrea Orru <andrea@orru.io>
Date:   Sat, 10 Mar 2018 16:59:28 -0800

zen-specific: main -> _start

Diffstat:
M
src/link.cpp
 | 
2
+-
M
std/special/bootstrap.zig
 | 
8
++++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git 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
@@ -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 {