| author |  Jakub Konka <kubkon@jakubkonka.com> 2021-05-14 11:46:50+02:00 |
| committer | Jakub Konka <kubkon@jakubkonka.com> 2021-05-14 13:08:56+02:00 |
| log | 00ebbe6df2249ba8201c0e5472d95022bf73e782 |
| tree | 8a71469cc3f1e2ec94360a9317ebcce576924c9a |
| parent | 8eea5eddf773a8d1f9f883e71d00409e454ee0bd |
macho: require _main as global export in self-hosted
Clean up type and description flags generation for exports
in self-hosted MachO backend.2 files changed, 32 insertions(+), 15 deletions(-)
src- link
- test
- stage2
src/link/MachO.zig+25-8
| ... | ... | @@ -1369,15 +1369,32 @@ pub fn updateDeclExports( |
| 1369 | 1369 | continue; |
| 1370 | 1370 | } |
| 1371 | 1371 | } |
| 1372 | const n_desc = switch (exp.options.linkage) { | |
| 1373 | .Internal => macho.REFERENCE_FLAG_PRIVATE_DEFINED, | |
| 1374 | .Strong => blk: { | |
| 1375 | if (mem.eql(u8, exp.options.name, "_start")) { | |
| 1372 | ||
| 1373 | var n_type: u8 = macho.N_SECT | macho.N_EXT; | |
| 1374 | var n_desc: u16 = 0; | |
| 1375 | ||
| 1376 | switch (exp.options.linkage) { | |
| 1377 | .Internal => { | |
| 1378 | // Symbol should be hidden, or in MachO lingo, private extern. | |
| 1379 | // We should also mark the symbol as Weak: n_desc == N_WEAK_DEF. | |
| 1380 | // TODO work out when to add N_WEAK_REF. | |
| 1381 | n_type |= macho.N_PEXT; | |
| 1382 | n_desc |= macho.N_WEAK_DEF; | |
| 1383 | }, | |
| 1384 | .Strong => { | |
| 1385 | // Check if the export is _main, and note if os. | |
| 1386 | // Otherwise, don't do anything since we already have all the flags | |
| 1387 | // set that we need for global (strong) linkage. | |
| 1388 | // n_type == N_SECT | N_EXT | |
| 1389 | if (mem.eql(u8, exp.options.name, "_main")) { | |
| 1376 | 1390 | self.entry_addr = decl_sym.n_value; |
| 1377 | 1391 | } |
| 1378 | break :blk macho.REFERENCE_FLAG_DEFINED; | |
| 1379 | 1392 | }, |
| 1380 | .Weak => macho.N_WEAK_REF, | |
| 1393 | .Weak => { | |
| 1394 | // Weak linkage is specified as part of n_desc field. | |
| 1395 | // Symbol's n_type is like for a symbol with strong linkage. | |
| 1396 | n_desc |= macho.N_WEAK_DEF; | |
| 1397 | }, | |
| 1381 | 1398 | .LinkOnce => { |
| 1382 | 1399 | try module.failed_exports.ensureCapacity(module.gpa, module.failed_exports.items().len + 1); |
| 1383 | 1400 | module.failed_exports.putAssumeCapacityNoClobber( |
| ... | ... | @@ -1386,8 +1403,8 @@ pub fn updateDeclExports( |
| 1386 | 1403 | ); |
| 1387 | 1404 | continue; |
| 1388 | 1405 | }, |
| 1389 | }; | |
| 1390 | const n_type = decl_sym.n_type | macho.N_EXT; | |
| 1406 | } | |
| 1407 | ||
| 1391 | 1408 | if (exp.link.macho.sym_index) |i| { |
| 1392 | 1409 | const sym = &self.globals.items[i]; |
| 1393 | 1410 | sym.* = .{ |
test/stage2/darwin.zig+7-7
| ... | ... | @@ -17,7 +17,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 17 | 17 | |
| 18 | 18 | // Incorrect return type |
| 19 | 19 | case.addError( |
| 20 | \\export fn _start() noreturn { | |
| 20 | \\export fn _main() noreturn { | |
| 21 | 21 | \\} |
| 22 | 22 | , &[_][]const u8{":2:1: error: expected noreturn, found void"}); |
| 23 | 23 | |
| ... | ... | @@ -26,7 +26,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 26 | 26 | \\extern "c" fn write(usize, usize, usize) usize; |
| 27 | 27 | \\extern "c" fn exit(usize) noreturn; |
| 28 | 28 | \\ |
| 29 | \\export fn _start() noreturn { | |
| 29 | \\export fn _main() noreturn { | |
| 30 | 30 | \\ print(); |
| 31 | 31 | \\ |
| 32 | 32 | \\ exit(0); |
| ... | ... | @@ -46,7 +46,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 46 | 46 | \\extern "c" fn write(usize, usize, usize) usize; |
| 47 | 47 | \\extern "c" fn exit(usize) noreturn; |
| 48 | 48 | \\ |
| 49 | \\export fn _start() noreturn { | |
| 49 | \\export fn _main() noreturn { | |
| 50 | 50 | \\ print(); |
| 51 | 51 | \\ print(); |
| 52 | 52 | \\ print(); |
| ... | ... | @@ -73,7 +73,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 73 | 73 | \\extern "c" fn write(usize, usize, usize) usize; |
| 74 | 74 | \\extern "c" fn exit(usize) noreturn; |
| 75 | 75 | \\ |
| 76 | \\export fn _start() noreturn { | |
| 76 | \\export fn _main() noreturn { | |
| 77 | 77 | \\ print(); |
| 78 | 78 | \\ |
| 79 | 79 | \\ exit(0); |
| ... | ... | @@ -93,7 +93,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 93 | 93 | \\extern "c" fn write(usize, usize, usize) usize; |
| 94 | 94 | \\extern "c" fn exit(usize) noreturn; |
| 95 | 95 | \\ |
| 96 | \\export fn _start() noreturn { | |
| 96 | \\export fn _main() noreturn { | |
| 97 | 97 | \\ print(); |
| 98 | 98 | \\ print(); |
| 99 | 99 | \\ |
| ... | ... | @@ -119,7 +119,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 119 | 119 | case.addCompareOutput( |
| 120 | 120 | \\extern "c" fn exit(usize) noreturn; |
| 121 | 121 | \\ |
| 122 | \\export fn _start() noreturn { | |
| 122 | \\export fn _main() noreturn { | |
| 123 | 123 | \\ exit(0); |
| 124 | 124 | \\} |
| 125 | 125 | , |
| ... | ... | @@ -130,7 +130,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 130 | 130 | \\extern "c" fn exit(usize) noreturn; |
| 131 | 131 | \\extern "c" fn write(usize, usize, usize) usize; |
| 132 | 132 | \\ |
| 133 | \\export fn _start() noreturn { | |
| 133 | \\export fn _main() noreturn { | |
| 134 | 134 | \\ _ = write(1, @ptrToInt("Hey!\n"), 5); |
| 135 | 135 | \\ exit(0); |
| 136 | 136 | \\} |