Commit 08c768ad82280463410eacc5b7f19389cb1ba49b | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-11-15 16:32:15-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-11-15 16:32:15-07:00
log	08c768ad82280463410eacc5b7f19389cb1ba49b
tree	8dd79b588a3b7a20a8589a4fd08a11881a8ff35c
parent	564629f70475a1e3b397179067e22d3f61772104

pre-merge cleanups

 * Annotate workarounds with their corresponding GitHub issue links.
 * Enable test coverage for LTO on Windows with the added c_compiler test.

4 files changed, 35 insertions(+), 21 deletions(-)

src
- mingw.zig
test
- standalone.zig
- standalone
  - c_compiler
    build.zig
  - mix_c_files
    build.zig

src/mingw.zig+4-2

...	...	@@ -92,8 +92,10 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
92	92	"-D_WIN32_WINNT=0x0f00",
93	93	"-D__MSVCRT_VERSION__=0x700",
94	94	});
95		if (std.mem.eql(u8, dep, "tlssup.c")) {
96		// Can't let LTO drop symbols defined in this file (eg: _tls_index)
	95	if (std.mem.eql(u8, dep, "tlssup.c") and comp.bin_file.options.lto) {
	96	// LLD will incorrectly drop the `_tls_index` symbol. Here we work
	97	// around it by not using LTO for this one file.
	98	// https://github.com/ziglang/zig/issues/8531
97	99	try args.append("-fno-lto");
98	100	}
99	101	c_source_files[i] = .{

test/standalone.zig+24-8

...	...	@@ -13,18 +13,27 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
13	13	cases.addBuildFile("test/standalone/main_pkg_path/build.zig", .{});
14	14	cases.addBuildFile("test/standalone/shared_library/build.zig", .{});
15	15	cases.addBuildFile("test/standalone/mix_o_files/build.zig", .{});
16		if (std.Target.current.os.tag == .macos) {
17		// TODO zld cannot link llvm-ir object files for LTO yet.
18		cases.addBuildFile("test/standalone/mix_c_files/build.zig", .{ .build_modes = false, .cross_targets = true });
	16	if (builtin.os.tag == .macos) {
	17	// Zig's macOS linker does not yet support LTO for LLVM IR files:
	18	// https://github.com/ziglang/zig/issues/8680
	19	cases.addBuildFile("test/standalone/mix_c_files/build.zig", .{
	20	.build_modes = false,
	21	.cross_targets = true,
	22	});
19	23	} else {
20		cases.addBuildFile("test/standalone/mix_c_files/build.zig", .{ .build_modes = true, .cross_targets = true });
	24	cases.addBuildFile("test/standalone/mix_c_files/build.zig", .{
	25	.build_modes = true,
	26	.cross_targets = true,
	27	});
21	28	}
22	29	cases.addBuildFile("test/standalone/global_linkage/build.zig", .{});
23	30	cases.addBuildFile("test/standalone/static_c_lib/build.zig", .{});
24	31	cases.addBuildFile("test/standalone/link_interdependent_static_c_libs/build.zig", .{});
25	32	cases.addBuildFile("test/standalone/link_static_lib_as_system_lib/build.zig", .{});
26	33	cases.addBuildFile("test/standalone/link_common_symbols/build.zig", .{});
27		cases.addBuildFile("test/standalone/link_frameworks/build.zig", .{ .requires_macos_sdk = true });
	34	cases.addBuildFile("test/standalone/link_frameworks/build.zig", .{
	35	.requires_macos_sdk = true,
	36	});
28	37	cases.addBuildFile("test/standalone/issue_339/build.zig", .{});
29	38	cases.addBuildFile("test/standalone/issue_8550/build.zig", .{});
30	39	cases.addBuildFile("test/standalone/issue_794/build.zig", .{});
...	...	@@ -39,10 +48,14 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
39	48	if (builtin.os.tag != .wasi) {
40	49	cases.addBuildFile("test/standalone/load_dynamic_library/build.zig", .{});
41	50	}
42		if (builtin.cpu.arch == .x86_64) { // TODO add C ABI support for other architectures
	51	// C ABI compatibility issue: https://github.com/ziglang/zig/issues/1481
	52	if (builtin.cpu.arch == .x86_64) {
43	53	cases.addBuildFile("test/stage1/c_abi/build.zig", .{});
44	54	}
45		cases.addBuildFile("test/standalone/c_compiler/build.zig", .{ .build_modes = true, .cross_targets = true });
	55	cases.addBuildFile("test/standalone/c_compiler/build.zig", .{
	56	.build_modes = true,
	57	.cross_targets = true,
	58	});
46	59
47	60	if (builtin.os.tag == .windows) {
48	61	cases.addC("test/standalone/issue_9402/main.zig");
...	...	@@ -52,7 +65,10 @@ pub fn addCases(cases: *tests.StandaloneContext) void {
52	65	cases.addBuildFile("test/standalone/pie/build.zig", .{});
53	66	}
54	67	// Try to build and run an Objective-C executable.
55		cases.addBuildFile("test/standalone/objc/build.zig", .{ .build_modes = true, .requires_macos_sdk = true });
	68	cases.addBuildFile("test/standalone/objc/build.zig", .{
	69	.build_modes = true,
	70	.requires_macos_sdk = true,
	71	});
56	72
57	73	// Ensure the development tools are buildable.
58	74	cases.add("tools/gen_spirv_spec.zig");

test/standalone/c_compiler/build.zig+2-4

...	...	@@ -3,6 +3,7 @@ const builtin = @import("builtin");
3	3	const Builder = std.build.Builder;
4	4	const CrossTarget = std.zig.CrossTarget;
5	5
	6	// TODO integrate this with the std.build executor API
6	7	fn isRunnableTarget(t: CrossTarget) bool {
7	8	if (t.isNative()) return true;
8	9
...	...	@@ -30,12 +31,9 @@ pub fn build(b: *Builder) void {
30	31	exe_cpp.setTarget(target);
31	32	exe_cpp.linkSystemLibrary("c++");
32	33
33		// disable broken LTO links:
34	34	switch (target.getOsTag()) {
35		.windows => {
36		exe_cpp.want_lto = false;
37		},
38	35	.macos => {
	36	// https://github.com/ziglang/zig/issues/8680
39	37	exe_cpp.want_lto = false;
40	38	exe_c.want_lto = false;
41	39	},

test/standalone/mix_c_files/build.zig+5-7

...	...	@@ -1,23 +1,20 @@
1	1	const std = @import("std");
	2	const builtin = @import("builtin");
2	3	const Builder = std.build.Builder;
3	4	const CrossTarget = std.zig.CrossTarget;
4	5
5		fn isUnpecifiedTarget(t: CrossTarget) bool {
6		return t.cpu_arch == null and t.abi == null and t.os_tag == null;
7		}
	6	// TODO integrate this with the std.build executor API
8	7	fn isRunnableTarget(t: CrossTarget) bool {
9	8	if (t.isNative()) return true;
10	9
11		return (t.getOsTag() == std.Target.current.os.tag and
12		t.getCpuArch() == std.Target.current.cpu.arch);
	10	return (t.getOsTag() == builtin.os.tag and
	11	t.getCpuArch() == builtin.cpu.arch);
13	12	}
14	13
15	14	pub fn build(b: *Builder) void {
16	15	const mode = b.standardReleaseOptions();
17	16	const target = b.standardTargetOptions(.{});
18	17
19		const test_step = b.step("test", "Test the program");
20
21	18	const exe = b.addExecutable("test", "main.zig");
22	19	exe.addCSourceFile("test.c", &[_][]const u8{"-std=c11"});
23	20	exe.setBuildMode(mode);
...	...	@@ -25,6 +22,7 @@ pub fn build(b: *Builder) void {
25	22	exe.setTarget(target);
26	23	b.default_step.dependOn(&exe.step);
27	24
	25	const test_step = b.step("test", "Test the program");
28	26	if (isRunnableTarget(target)) {
29	27	const run_cmd = exe.run();
30	28	test_step.dependOn(&run_cmd.step);