| author |  Takeshi Yoneda <takeshi@tetrate.io> 2021-07-06 20:49:57+09:00 |
| committer |  Jakub Konka <kubkon@jakubkonka.com> 2021-07-11 00:06:47+02:00 |
| log | b9e896d7b076e59d6f6dd9b0bad9697875d1f6e4 |
| tree | af131c1a7fae17493b84fee0102dac7bd3a9689f |
| parent | 2d855745f91852af92ad970feef96e55919993d3 |
wasi-libc: remove crt1.o as it's not WASI ABI compatible
Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>2 files changed, 0 insertions(+), 39 deletions(-)
lib- libc
- wasi
- libc-bottom-half
- crt
lib/libc/wasi/libc-bottom-half/crt/crt1.c deleted-24
| ... | ... | @@ -1,24 +0,0 @@ |
| 1 | #include <wasi/api.h> | |
| 2 | extern void __wasm_call_ctors(void); | |
| 3 | extern int __original_main(void); | |
| 4 | extern void __wasm_call_dtors(void); | |
| 5 | ||
| 6 | __attribute__((export_name("_start"))) | |
| 7 | void _start(void) { | |
| 8 | // The linker synthesizes this to call constructors. | |
| 9 | __wasm_call_ctors(); | |
| 10 | ||
| 11 | // Call `__original_main` which will either be the application's zero-argument | |
| 12 | // `__original_main` function or a libc routine which calls `__main_void`. | |
| 13 | // TODO: Call `main` directly once we no longer have to support old compilers. | |
| 14 | int r = __original_main(); | |
| 15 | ||
| 16 | // Call atexit functions, destructors, stdio cleanup, etc. | |
| 17 | __wasm_call_dtors(); | |
| 18 | ||
| 19 | // If main exited successfully, just return, otherwise call | |
| 20 | // `__wasi_proc_exit`. | |
| 21 | if (r != 0) { | |
| 22 | __wasi_proc_exit(r); | |
| 23 | } | |
| 24 | } |
src/wasi_libc.zig-15
| ... | ... | @@ -9,7 +9,6 @@ const target_util = @import("target.zig"); |
| 9 | 9 | const musl = @import("musl.zig"); |
| 10 | 10 | |
| 11 | 11 | pub const CRTFile = enum { |
| 12 | crt1_o, | |
| 13 | 12 | crt1_reactor_o, |
| 14 | 13 | crt1_command_o, |
| 15 | 14 | libc_a, |
| ... | ... | @@ -71,19 +70,6 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { |
| 71 | 70 | const arena = &arena_allocator.allocator; |
| 72 | 71 | |
| 73 | 72 | switch (crt_file) { |
| 74 | .crt1_o => { | |
| 75 | var args = std.ArrayList([]const u8).init(arena); | |
| 76 | try addCCArgs(comp, arena, &args, false); | |
| 77 | try addLibcBottomHalfIncludes(comp, arena, &args); | |
| 78 | return comp.build_crt_file("crt1", .Obj, &[1]Compilation.CSourceFile{ | |
| 79 | .{ | |
| 80 | .src_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ | |
| 81 | "libc", try sanitize(arena, crt1_src_file), | |
| 82 | }), | |
| 83 | .extra_flags = args.items, | |
| 84 | }, | |
| 85 | }); | |
| 86 | }, | |
| 87 | 73 | .crt1_reactor_o => { |
| 88 | 74 | var args = std.ArrayList([]const u8).init(arena); |
| 89 | 75 | try addCCArgs(comp, arena, &args, false); |
| ... | ... | @@ -1151,7 +1137,6 @@ const libc_top_half_src_files = [_][]const u8{ |
| 1151 | 1137 | "wasi/libc-top-half/sources/arc4random.c", |
| 1152 | 1138 | }; |
| 1153 | 1139 | |
| 1154 | const crt1_src_file = "wasi/libc-bottom-half/crt/crt1.c"; | |
| 1155 | 1140 | const crt1_command_src_file = "wasi/libc-bottom-half/crt/crt1-command.c"; |
| 1156 | 1141 | const crt1_reactor_src_file = "wasi/libc-bottom-half/crt/crt1-reactor.c"; |
| 1157 | 1142 |