Commit 938f9dea374193972be05b19b58dced54d79b1cb | zig

author	Luuk de Gram <luuk@degram.dev> 2023-09-01 16:37:07+02:00
committer	Luuk de Gram <luuk@degram.dev> 2023-11-03 12:48:53+01:00
log	938f9dea374193972be05b19b58dced54d79b1cb
tree	3778a6e153a29ffa267c9ab3e6b64824466d6d25
parent	58618afaee7c14feedad4f115e9a4468bac4c529
signature	Commit is signed but in an unrecognized format.

update linker tests

This updates all linker tests to include `no_entry` as well as changes
all tests to executable so they do not need to be updated later when
the in-house WebAssembly linker supports dynamic libraries.

14 files changed, 113 insertions(+), 93 deletions(-)

lib
- std
  - Build
    Step
    Compile.zig
test
- link
  - wasm
    archive
    build.zig
    basic-features
    build.zig
    bss
    build.zig
    export-data
    build.zig
    export
    build.zig
    extern-mangle
    build.zig
    function-table
    build.zig
    infer-features
    build.zig
    producers
    build.zig
    segments
    build.zig
    shared-memory
    build.zig
    stack_pointer
    build.zig
    type
    build.zig

lib/std/Build/Step/Compile.zig+5-1

...	...	@@ -1853,7 +1853,11 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
1853	1853	if (self.global_base) \|global_base\| {
1854	1854	try zig_args.append(b.fmt("--global-base={d}", .{global_base}));
1855	1855	}
1856		try addFlag(&zig_args, "entry", self.no_entry);
	1856	// invert the value due to naming so when `no_entry` is set to 'true'
	1857	// we actually emit the flag `-fno_entry`.
	1858	if (self.no_entry) \|no_entry\| {
	1859	try addFlag(&zig_args, "entry", !no_entry);
	1860	}
1857	1861
1858	1862	if (self.code_model != .default) {
1859	1863	try zig_args.append("-mcmodel");

test/link/wasm/archive/build.zig+2-1

...	...	@@ -15,12 +15,13 @@ pub fn build(b: *std.Build) void {
15	15	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16	16	// The code in question will pull-in compiler-rt,
17	17	// and therefore link with its archive file.
18		const lib = b.addSharedLibrary(.{
	18	const lib = b.addExecutable(.{
19	19	.name = "main",
20	20	.root_source_file = .{ .path = "main.zig" },
21	21	.optimize = optimize,
22	22	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
23	23	});
	24	lib.no_entry = true;
24	25	lib.use_llvm = false;
25	26	lib.use_lld = false;
26	27	lib.strip = false;

test/link/wasm/basic-features/build.zig+2-1

...	...	@@ -4,7 +4,7 @@ pub const requires_stage2 = true;
4	4
5	5	pub fn build(b: *std.Build) void {
6	6	// Library with explicitly set cpu features
7		const lib = b.addSharedLibrary(.{
	7	const lib = b.addExecutable(.{
8	8	.name = "lib",
9	9	.root_source_file = .{ .path = "main.zig" },
10	10	.optimize = .Debug,
...	...	@@ -15,6 +15,7 @@ pub fn build(b: *std.Build) void {
15	15	.os_tag = .freestanding,
16	16	},
17	17	});
	18	lib.no_entry = true;
18	19	lib.use_llvm = false;
19	20	lib.use_lld = false;
20	21

test/link/wasm/bss/build.zig+4-2

...	...	@@ -14,12 +14,13 @@ pub fn build(b: *std.Build) void {
14	14
15	15	fn add(b: std.Build, test_step: std.Build.Step, optimize_mode: std.builtin.OptimizeMode, is_safe: bool) void {
16	16	{
17		const lib = b.addSharedLibrary(.{
	17	const lib = b.addExecutable(.{
18	18	.name = "lib",
19	19	.root_source_file = .{ .path = "lib.zig" },
20	20	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
21	21	.optimize = optimize_mode,
22	22	});
	23	lib.no_entry = true;
23	24	lib.use_llvm = false;
24	25	lib.use_lld = false;
25	26	lib.strip = false;
...	...	@@ -60,12 +61,13 @@ fn add(b: std.Build, test_step: std.Build.Step, optimize_mode: std.builtin.Opt
60	61
61	62	// verify zero'd declaration is stored in bss for all optimization modes.
62	63	{
63		const lib = b.addSharedLibrary(.{
	64	const lib = b.addExecutable(.{
64	65	.name = "lib",
65	66	.root_source_file = .{ .path = "lib2.zig" },
66	67	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
67	68	.optimize = optimize_mode,
68	69	});
	70	lib.no_entry = true;
69	71	lib.use_llvm = false;
70	72	lib.use_lld = false;
71	73	lib.strip = false;

test/link/wasm/export-data/build.zig+2-1

...	...	@@ -9,12 +9,13 @@ pub fn build(b: *std.Build) void {
9	9	return;
10	10	}
11	11
12		const lib = b.addSharedLibrary(.{
	12	const lib = b.addExecutable(.{
13	13	.name = "lib",
14	14	.root_source_file = .{ .path = "lib.zig" },
15	15	.optimize = .ReleaseSafe, // to make the output deterministic in address positions
16	16	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
17	17	});
	18	lib.no_entry = true;
18	19	lib.use_lld = false;
19	20	lib.export_symbol_names = &.{ "foo", "bar" };
20	21	lib.global_base = 0; // put data section at address 0 to make data symbols easier to parse

test/link/wasm/export/build.zig+6-3

...	...	@@ -13,31 +13,34 @@ pub fn build(b: *std.Build) void {
13	13	}
14	14
15	15	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16		const no_export = b.addSharedLibrary(.{
	16	const no_export = b.addExecutable(.{
17	17	.name = "no-export",
18	18	.root_source_file = .{ .path = "main.zig" },
19	19	.optimize = optimize,
20	20	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
21	21	});
	22	no_export.no_entry = true;
22	23	no_export.use_llvm = false;
23	24	no_export.use_lld = false;
24	25
25		const dynamic_export = b.addSharedLibrary(.{
	26	const dynamic_export = b.addExecutable(.{
26	27	.name = "dynamic",
27	28	.root_source_file = .{ .path = "main.zig" },
28	29	.optimize = optimize,
29	30	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
30	31	});
	32	dynamic_export.no_entry = true;
31	33	dynamic_export.rdynamic = true;
32	34	dynamic_export.use_llvm = false;
33	35	dynamic_export.use_lld = false;
34	36
35		const force_export = b.addSharedLibrary(.{
	37	const force_export = b.addExecutable(.{
36	38	.name = "force",
37	39	.root_source_file = .{ .path = "main.zig" },
38	40	.optimize = optimize,
39	41	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
40	42	});
	43	force_export.no_entry = true;
41	44	force_export.export_symbol_names = &.{"foo"};
42	45	force_export.use_llvm = false;
43	46	force_export.use_lld = false;

test/link/wasm/extern-mangle/build.zig+2-1

...	...	@@ -11,12 +11,13 @@ pub fn build(b: *std.Build) void {
11	11	}
12	12
13	13	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
14		const lib = b.addSharedLibrary(.{
	14	const lib = b.addExecutable(.{
15	15	.name = "lib",
16	16	.root_source_file = .{ .path = "lib.zig" },
17	17	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
18	18	.optimize = optimize,
19	19	});
	20	lib.no_entry = true;
20	21	lib.import_symbols = true; // import `a` and `b`
21	22	lib.rdynamic = true; // export `foo`
22	23

test/link/wasm/function-table/build.zig+6-3

...	...	@@ -13,32 +13,35 @@ pub fn build(b: *std.Build) void {
13	13	}
14	14
15	15	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16		const import_table = b.addSharedLibrary(.{
	16	const import_table = b.addExecutable(.{
17	17	.name = "import_table",
18	18	.root_source_file = .{ .path = "lib.zig" },
19	19	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
20	20	.optimize = optimize,
21	21	});
	22	import_table.no_entry = true;
22	23	import_table.use_llvm = false;
23	24	import_table.use_lld = false;
24	25	import_table.import_table = true;
25	26
26		const export_table = b.addSharedLibrary(.{
	27	const export_table = b.addExecutable(.{
27	28	.name = "export_table",
28	29	.root_source_file = .{ .path = "lib.zig" },
29	30	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
30	31	.optimize = optimize,
31	32	});
	33	export_table.no_entry = true;
32	34	export_table.use_llvm = false;
33	35	export_table.use_lld = false;
34	36	export_table.export_table = true;
35	37
36		const regular_table = b.addSharedLibrary(.{
	38	const regular_table = b.addExecutable(.{
37	39	.name = "regular_table",
38	40	.root_source_file = .{ .path = "lib.zig" },
39	41	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
40	42	.optimize = optimize,
41	43	});
	44	regular_table.no_entry = true;
42	45	regular_table.use_llvm = false;
43	46	regular_table.use_lld = false;
44	47

test/link/wasm/infer-features/build.zig+2-1

...	...	@@ -17,7 +17,7 @@ pub fn build(b: *std.Build) void {
17	17
18	18	// Wasm library that doesn't have any features specified. This will
19	19	// infer its featureset from other linked object files.
20		const lib = b.addSharedLibrary(.{
	20	const lib = b.addExecutable(.{
21	21	.name = "lib",
22	22	.root_source_file = .{ .path = "main.zig" },
23	23	.optimize = .Debug,
...	...	@@ -27,6 +27,7 @@ pub fn build(b: *std.Build) void {
27	27	.os_tag = .freestanding,
28	28	},
29	29	});
	30	lib.no_entry = true;
30	31	lib.use_llvm = false;
31	32	lib.use_lld = false;
32	33	lib.addObject(c_obj);

test/link/wasm/producers/build.zig+2-1

...	...	@@ -14,12 +14,13 @@ pub fn build(b: *std.Build) void {
14	14	}
15	15
16	16	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
17		const lib = b.addSharedLibrary(.{
	17	const lib = b.addExecutable(.{
18	18	.name = "lib",
19	19	.root_source_file = .{ .path = "lib.zig" },
20	20	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
21	21	.optimize = optimize,
22	22	});
	23	lib.no_entry = true;
23	24	lib.use_llvm = false;
24	25	lib.use_lld = false;
25	26	lib.strip = false;

test/link/wasm/segments/build.zig+2-1

...	...	@@ -13,12 +13,13 @@ pub fn build(b: *std.Build) void {
13	13	}
14	14
15	15	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16		const lib = b.addSharedLibrary(.{
	16	const lib = b.addExecutable(.{
17	17	.name = "lib",
18	18	.root_source_file = .{ .path = "lib.zig" },
19	19	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
20	20	.optimize = optimize,
21	21	});
	22	lib.no_entry = true;
22	23	lib.use_llvm = false;
23	24	lib.use_lld = false;
24	25	lib.strip = false;

test/link/wasm/shared-memory/build.zig+74-75

...	...	@@ -11,88 +11,87 @@ pub fn build(b: *std.Build) void {
11	11	}
12	12
13	13	fn add(b: std.Build, test_step: std.Build.Step, optimize_mode: std.builtin.OptimizeMode) void {
14		{
15		const lib = b.addSharedLibrary(.{
16		.name = "lib",
17		.root_source_file = .{ .path = "lib.zig" },
18		.target = .{
19		.cpu_arch = .wasm32,
20		.cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp },
21		.cpu_features_add = std.Target.wasm.featureSet(&.{ .atomics, .bulk_memory }),
22		.os_tag = .freestanding,
23		},
24		.optimize = optimize_mode,
25		});
26		lib.use_lld = false;
27		lib.strip = false;
28		lib.import_memory = true;
29		lib.export_memory = true;
30		lib.shared_memory = true;
31		lib.max_memory = 67108864;
32		lib.single_threaded = false;
33		lib.export_symbol_names = &.{"foo"};
	14	const lib = b.addExecutable(.{
	15	.name = "lib",
	16	.root_source_file = .{ .path = "lib.zig" },
	17	.target = .{
	18	.cpu_arch = .wasm32,
	19	.cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp },
	20	.cpu_features_add = std.Target.wasm.featureSet(&.{ .atomics, .bulk_memory }),
	21	.os_tag = .freestanding,
	22	},
	23	.optimize = optimize_mode,
	24	});
	25	lib.no_entry = true;
	26	lib.use_lld = false;
	27	lib.strip = false;
	28	lib.import_memory = true;
	29	lib.export_memory = true;
	30	lib.shared_memory = true;
	31	lib.max_memory = 67108864;
	32	lib.single_threaded = false;
	33	lib.export_symbol_names = &.{"foo"};
34	34
35		const check_lib = lib.checkObject();
	35	const check_lib = lib.checkObject();
36	36
37		check_lib.checkStart("Section import");
38		check_lib.checkNext("entries 1");
39		check_lib.checkNext("module env");
40		check_lib.checkNext("name memory"); // ensure we are importing memory
	37	check_lib.checkStart("Section import");
	38	check_lib.checkNext("entries 1");
	39	check_lib.checkNext("module env");
	40	check_lib.checkNext("name memory"); // ensure we are importing memory
41	41
42		check_lib.checkStart("Section export");
43		check_lib.checkNext("entries 2");
44		check_lib.checkNext("name memory"); // ensure we also export memory again
	42	check_lib.checkStart("Section export");
	43	check_lib.checkNext("entries 2");
	44	check_lib.checkNext("name memory"); // ensure we also export memory again
45	45
46		// This section must be emit as the start function is set to the index
47		// of __wasm_init_memory
48		// release modes will have the TLS segment optimized out in our test-case.
49		// This means we won't have __wasm_init_memory in such case, and therefore
50		// should also not have a section "start"
51		if (optimize_mode == .Debug) {
52		check_lib.checkStart("Section start");
53		}
54
55		// This section is only and must be emit when shared-memory is enabled
56		// release modes will have the TLS segment optimized out in our test-case.
57		if (optimize_mode == .Debug) {
58		check_lib.checkStart("Section data_count");
59		check_lib.checkNext("count 3");
60		}
	46	// This section must be emit as the start function is set to the index
	47	// of __wasm_init_memory
	48	// release modes will have the TLS segment optimized out in our test-case.
	49	// This means we won't have __wasm_init_memory in such case, and therefore
	50	// should also not have a section "start"
	51	if (optimize_mode == .Debug) {
	52	check_lib.checkStart("Section start");
	53	}
61	54
62		check_lib.checkStart("Section custom");
63		check_lib.checkNext("name name");
64		check_lib.checkNext("type function");
65		if (optimize_mode == .Debug) {
66		check_lib.checkNext("name __wasm_init_memory");
67		}
68		check_lib.checkNext("name __wasm_init_tls");
69		check_lib.checkNext("type global");
	55	// This section is only and must be emit when shared-memory is enabled
	56	// release modes will have the TLS segment optimized out in our test-case.
	57	if (optimize_mode == .Debug) {
	58	check_lib.checkStart("Section data_count");
	59	check_lib.checkNext("count 3");
	60	}
70	61
71		// In debug mode the symbol __tls_base is resolved to an undefined symbol
72		// from the object file, hence its placement differs than in release modes
73		// where the entire tls segment is optimized away, and tls_base will have
74		// its original position.
75		if (optimize_mode == .Debug) {
76		check_lib.checkNext("name __tls_size");
77		check_lib.checkNext("name __tls_align");
78		check_lib.checkNext("name __tls_base");
79		} else {
80		check_lib.checkNext("name __tls_base");
81		check_lib.checkNext("name __tls_size");
82		check_lib.checkNext("name __tls_align");
83		}
	62	check_lib.checkStart("Section custom");
	63	check_lib.checkNext("name name");
	64	check_lib.checkNext("type function");
	65	if (optimize_mode == .Debug) {
	66	check_lib.checkNext("name __wasm_init_memory");
	67	}
	68	check_lib.checkNext("name __wasm_init_tls");
	69	check_lib.checkNext("type global");
84	70
85		check_lib.checkNext("type data_segment");
86		if (optimize_mode == .Debug) {
87		check_lib.checkNext("names 3");
88		check_lib.checkNext("index 0");
89		check_lib.checkNext("name .rodata");
90		check_lib.checkNext("index 1");
91		check_lib.checkNext("name .bss");
92		check_lib.checkNext("index 2");
93		check_lib.checkNext("name .tdata");
94		}
	71	// In debug mode the symbol __tls_base is resolved to an undefined symbol
	72	// from the object file, hence its placement differs than in release modes
	73	// where the entire tls segment is optimized away, and tls_base will have
	74	// its original position.
	75	if (optimize_mode == .Debug) {
	76	check_lib.checkNext("name __tls_size");
	77	check_lib.checkNext("name __tls_align");
	78	check_lib.checkNext("name __tls_base");
	79	} else {
	80	check_lib.checkNext("name __tls_base");
	81	check_lib.checkNext("name __tls_size");
	82	check_lib.checkNext("name __tls_align");
	83	}
95	84
96		test_step.dependOn(&check_lib.step);
	85	check_lib.checkNext("type data_segment");
	86	if (optimize_mode == .Debug) {
	87	check_lib.checkNext("names 3");
	88	check_lib.checkNext("index 0");
	89	check_lib.checkNext("name .rodata");
	90	check_lib.checkNext("index 1");
	91	check_lib.checkNext("name .bss");
	92	check_lib.checkNext("index 2");
	93	check_lib.checkNext("name .tdata");
97	94	}
	95
	96	test_step.dependOn(&check_lib.step);
98	97	}

test/link/wasm/stack_pointer/build.zig+2-1

...	...	@@ -13,12 +13,13 @@ pub fn build(b: *std.Build) void {
13	13	}
14	14
15	15	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16		const lib = b.addSharedLibrary(.{
	16	const lib = b.addExecutable(.{
17	17	.name = "lib",
18	18	.root_source_file = .{ .path = "lib.zig" },
19	19	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
20	20	.optimize = optimize,
21	21	});
	22	lib.no_entry = true;
22	23	lib.use_llvm = false;
23	24	lib.use_lld = false;
24	25	lib.strip = false;

test/link/wasm/type/build.zig+2-1

...	...	@@ -13,12 +13,13 @@ pub fn build(b: *std.Build) void {
13	13	}
14	14
15	15	fn add(b: std.Build, test_step: std.Build.Step, optimize: std.builtin.OptimizeMode) void {
16		const lib = b.addSharedLibrary(.{
	16	const lib = b.addExecutable(.{
17	17	.name = "lib",
18	18	.root_source_file = .{ .path = "lib.zig" },
19	19	.target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
20	20	.optimize = optimize,
21	21	});
	22	lib.no_entry = true;
22	23	lib.use_llvm = false;
23	24	lib.use_lld = false;
24	25	lib.strip = false;