Commit a9b18023a4c33a0563fca2aa20a239e3ee38927a | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-09-17 23:27:24-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-09-17 23:27:24-07:00
log	a9b18023a4c33a0563fca2aa20a239e3ee38927a
tree	88a968afb4e2f56c0fff6757eb059d36c435d23b
parent	dc478687d95ee0d495cd26182edae78a01db59af

stage2: implement --show-builtin

This takes the place of `zig builtin`. This is an improvement over the
command because now the generated source will correctly show LinkMode
and OutputMode, whereas before it was always stuck as Static and Obj,
respectively.

11 files changed, 247 insertions(+), 64 deletions(-)

BRANCH_TODO
src-self-hosted
src

BRANCH_TODO+8-6

...	...	@@ -1,9 +1,5 @@
1		* `zig builtin`
2	1	* `zig translate-c`
3	2	* `zig test`
4		* `zig run`
5		* `zig init-lib`
6		* `zig init-exe`
7	3	* `zig build`
8	4	* `-ftime-report`
9	5	* -fstack-report print stack size diagnostics\n"
...	...	@@ -15,14 +11,14 @@
15	11	* -femit-llvm-ir produce a .ll file with LLVM IR\n"
16	12	* -fno-emit-llvm-ir (default) do not produce a .ll file with LLVM IR\n"
17	13	* --cache-dir [path] override the local cache directory\n"
18		* move main.cpp to stage2
19	14	* make sure zig cc works
20	15	- using it as a preprocessor (-E)
21	16	- try building some software
22	17	* support rpaths in ELF linker code
23	18	* build & link against compiler-rt
24	19	- stage1 C++ code integration
25		* build & link againstn freestanding libc
	20	* repair @cImport
	21	* build & link against freestanding libc
26	22	* add CLI support for a way to pass extra flags to c source files
27	23	* capture lld stdout/stderr better
28	24	* musl
...	...	@@ -41,6 +37,9 @@
41	37	* implement -fno-emit-bin
42	38	* audit the base cache hash
43	39	* audit the CLI options for stage2
	40	* `zig init-lib`
	41	* `zig init-exe`
	42	* `zig run`
44	43
45	44	* implement serialization/deserialization of incremental compilation metadata
46	45	* incremental compilation - implement detection of which source files changed
...	...	@@ -69,3 +68,6 @@
69	68	* rename src-self-hosted/ to src/
70	69	* improve Directory.join to only use 1 allocation in a clean way.
71	70	* tracy builds with lc++
	71	* some kind of "zig identifier escape" function rather than unconditionally using @"" syntax
	72	in builtin.zig
	73	* rename Mode to OptimizeMode

src-self-hosted/Compilation.zig+201-18

...	...	@@ -29,7 +29,7 @@ c_object_table: std.AutoArrayHashMapUnmanaged(*CObject, void) = .{},
29	29
30	30	link_error_flags: link.File.ErrorFlags = .{},
31	31
32		work_queue: std.fifo.LinearFifo(WorkItem, .Dynamic),
	32	work_queue: std.fifo.LinearFifo(Job, .Dynamic),
33	33
34	34	/// The ErrorMsg memory is owned by the `CObject`, using Compilation's general purpose allocator.
35	35	failed_c_objects: std.AutoArrayHashMapUnmanaged(CObject, ErrorMsg) = .{},
...	...	@@ -43,8 +43,9 @@ sanitize_c: bool,
43	43	/// This is `true` for `zig cc`, `zig c++`, and `zig translate-c`.
44	44	clang_passthrough_mode: bool,
45	45	/// Whether to print clang argvs to stdout.
46		debug_cc: bool,
	46	verbose_cc: bool,
47	47	disable_c_depfile: bool,
	48	is_test: bool,
48	49
49	50	c_source_files: []const CSourceFile,
50	51	clang_argv: []const []const u8,
...	...	@@ -56,16 +57,16 @@ zig_cache_directory: Directory,
56	57	libc_include_dir_list: []const []const u8,
57	58	rand: *std.rand.Random,
58	59
59		/// Populated when we build libc++.a. A WorkItem to build this is placed in the queue
	60	/// Populated when we build libc++.a. A Job to build this is placed in the queue
60	61	/// and resolved before calling linker.flush().
61	62	libcxx_static_lib: ?[]const u8 = null,
62		/// Populated when we build libc++abi.a. A WorkItem to build this is placed in the queue
	63	/// Populated when we build libc++abi.a. A Job to build this is placed in the queue
63	64	/// and resolved before calling linker.flush().
64	65	libcxxabi_static_lib: ?[]const u8 = null,
65		/// Populated when we build libunwind.a. A WorkItem to build this is placed in the queue
	66	/// Populated when we build libunwind.a. A Job to build this is placed in the queue
66	67	/// and resolved before calling linker.flush().
67	68	libunwind_static_lib: ?CRTFile = null,
68		/// Populated when we build c.a. A WorkItem to build this is placed in the queue
	69	/// Populated when we build c.a. A Job to build this is placed in the queue
69	70	/// and resolved before calling linker.flush().
70	71	libc_static_lib: ?[]const u8 = null,
71	72
...	...	@@ -98,7 +99,7 @@ pub const CSourceFile = struct {
98	99	extra_flags: []const []const u8 = &[0][]const u8{},
99	100	};
100	101
101		const WorkItem = union(enum) {
	102	const Job = union(enum) {
102	103	/// Write the machine code for a Decl to the output file.
103	104	codegen_decl: *Module.Decl,
104	105	/// The Decl needs to be analyzed and possibly export itself.
...	...	@@ -116,8 +117,11 @@ const WorkItem = union(enum) {
116	117	glibc_crt_file: glibc.CRTFile,
117	118	/// all of the glibc shared objects
118	119	glibc_shared_objects,
119
	120	/// libunwind.a, usually needed when linking libc
120	121	libunwind: void,
	122
	123	/// Generate builtin.zig source code and write it into the correct place.
	124	generate_builtin_zig: void,
121	125	};
122	126
123	127	pub const CObject = struct {
...	...	@@ -282,8 +286,9 @@ pub const InitOptions = struct {
282	286	linker_z_nodelete: bool = false,
283	287	linker_z_defs: bool = false,
284	288	clang_passthrough_mode: bool = false,
285		debug_cc: bool = false,
286		debug_link: bool = false,
	289	verbose_cc: bool = false,
	290	verbose_link: bool = false,
	291	is_test: bool = false,
287	292	stack_size_override: ?u64 = null,
288	293	self_exe_path: ?[]const u8 = null,
289	294	version: ?std.builtin.Version = null,
...	...	@@ -570,6 +575,11 @@ pub fn create(gpa: Allocator, options: InitOptions) !Compilation {
570	575	break :blk link_artifact_directory;
571	576	};
572	577
	578	const error_return_tracing = !options.strip and switch (options.optimize_mode) {
	579	.Debug, .ReleaseSafe => true,
	580	.ReleaseFast, .ReleaseSmall => false,
	581	};
	582
573	583	const bin_file = try link.File.openPath(gpa, .{
574	584	.directory = bin_directory,
575	585	.sub_path = emit_bin.basename,
...	...	@@ -612,9 +622,10 @@ pub fn create(gpa: Allocator, options: InitOptions) !Compilation {
612	622	.valgrind = valgrind,
613	623	.stack_check = stack_check,
614	624	.single_threaded = single_threaded,
615		.debug_link = options.debug_link,
	625	.verbose_link = options.verbose_link,
616	626	.machine_code_model = options.machine_code_model,
617	627	.dll_export_fns = dll_export_fns,
	628	.error_return_tracing = error_return_tracing,
618	629	});
619	630	errdefer bin_file.destroy();
620	631
...	...	@@ -624,7 +635,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !Compilation {
624	635	.zig_lib_directory = options.zig_lib_directory,
625	636	.zig_cache_directory = options.zig_cache_directory,
626	637	.bin_file = bin_file,
627		.work_queue = std.fifo.LinearFifo(WorkItem, .Dynamic).init(gpa),
	638	.work_queue = std.fifo.LinearFifo(Job, .Dynamic).init(gpa),
628	639	.keep_source_files_loaded = options.keep_source_files_loaded,
629	640	.use_clang = use_clang,
630	641	.clang_argv = options.clang_argv,
...	...	@@ -635,14 +646,19 @@ pub fn create(gpa: Allocator, options: InitOptions) !Compilation {
635	646	.sanitize_c = sanitize_c,
636	647	.rand = options.rand,
637	648	.clang_passthrough_mode = options.clang_passthrough_mode,
638		.debug_cc = options.debug_cc,
	649	.verbose_cc = options.verbose_cc,
639	650	.disable_c_depfile = options.disable_c_depfile,
640	651	.owned_link_dir = owned_link_dir,
	652	.is_test = options.is_test,
641	653	};
642	654	break :comp comp;
643	655	};
644	656	errdefer comp.destroy();
645	657
	658	if (comp.bin_file.options.module) \|mod\| {
	659	try comp.work_queue.writeItem(.{ .generate_builtin_zig = {} });
	660	}
	661
646	662	// Add a `CObject` for each `c_source_files`.
647	663	try comp.c_object_table.ensureCapacity(gpa, options.c_source_files.len);
648	664	for (options.c_source_files) \|c_source_file\| {
...	...	@@ -659,7 +675,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !Compilation {
659	675	// If we need to build glibc for the target, add work items for it.
660	676	// We go through the work queue so that building can be done in parallel.
661	677	if (comp.wantBuildGLibCFromSource()) {
662		try comp.addBuildingGLibCWorkItems();
	678	try comp.addBuildingGLibCJobs();
663	679	}
664	680	if (comp.wantBuildLibUnwindFromSource()) {
665	681	try comp.work_queue.writeItem(.{ .libunwind = {} });
...	...	@@ -715,7 +731,7 @@ pub fn update(self: *Compilation) !void {
715	731	defer tracy.end();
716	732
717	733	// For compiling C objects, we rely on the cache hash system to avoid duplicating work.
718		// Add a WorkItem for each C object.
	734	// Add a Job for each C object.
719	735	try self.work_queue.ensureUnusedCapacity(self.c_object_table.items().len);
720	736	for (self.c_object_table.items()) \|entry\| {
721	737	self.work_queue.writeItemAssumeCapacity(.{ .c_object = entry.key });
...	...	@@ -974,6 +990,13 @@ pub fn performAllTheWork(self: *Compilation) error{OutOfMemory}!void {
974	990	fatal("unable to build libunwind: {}", .{@errorName(err)});
975	991	};
976	992	},
	993	.generate_builtin_zig => {
	994	// This Job is only queued up if there is a zig module.
	995	self.updateBuiltinZigFile(self.bin_file.options.module.?) catch \|err\| {
	996	// TODO Expose this as a normal compile error rather than crashing here.
	997	fatal("unable to update builtin.zig file: {}", .{@errorName(err)});
	998	};
	999	},
977	1000	};
978	1001	}
979	1002
...	...	@@ -1057,7 +1080,7 @@ fn updateCObject(comp: Compilation, c_object: CObject) !void {
1057	1080	try argv.append(c_object.src.src_path);
1058	1081	try argv.appendSlice(c_object.src.extra_flags);
1059	1082
1060		if (comp.debug_cc) {
	1083	if (comp.verbose_cc) {
1061	1084	for (argv.items[0 .. argv.items.len - 1]) \|arg\| {
1062	1085	std.debug.print("{} ", .{arg});
1063	1086	}
...	...	@@ -1616,8 +1639,8 @@ pub fn get_libc_crt_file(comp: Compilation, arena: Allocator, basename: []cons
1616	1639	return full_path;
1617	1640	}
1618	1641
1619		fn addBuildingGLibCWorkItems(comp: *Compilation) !void {
1620		try comp.work_queue.write(&[_]WorkItem{
	1642	fn addBuildingGLibCJobs(comp: *Compilation) !void {
	1643	try comp.work_queue.write(&[_]Job{
1621	1644	.{ .glibc_crt_file = .crti_o },
1622	1645	.{ .glibc_crt_file = .crtn_o },
1623	1646	.{ .glibc_crt_file = .scrt1_o },
...	...	@@ -1646,3 +1669,163 @@ fn wantBuildLibUnwindFromSource(comp: *Compilation) bool {
1646	1669	return comp.bin_file.options.link_libc and is_exe_or_dyn_lib and
1647	1670	comp.bin_file.options.libc_installation == null;
1648	1671	}
	1672
	1673	fn updateBuiltinZigFile(comp: Compilation, mod: Module) !void {
	1674	const source = try comp.generateBuiltinZigSource();
	1675	defer comp.gpa.free(source);
	1676	try mod.zig_cache_artifact_directory.handle.writeFile("builtin.zig", source);
	1677	}
	1678
	1679	pub fn generateBuiltinZigSource(comp: *Compilation) ![]u8 {
	1680	var buffer = std.ArrayList(u8).init(comp.gpa);
	1681	defer buffer.deinit();
	1682
	1683	const target = comp.getTarget();
	1684	const generic_arch_name = target.cpu.arch.genericName();
	1685
	1686	@setEvalBranchQuota(4000);
	1687	try buffer.writer().print(
	1688	\\usingnamespace @import("std").builtin;
	1689	\\/// Deprecated
	1690	\\pub const arch = std.Target.current.cpu.arch;
	1691	\\/// Deprecated
	1692	\\pub const endian = std.Target.current.cpu.arch.endian();
	1693	\\pub const output_mode = OutputMode.{};
	1694	\\pub const link_mode = LinkMode.{};
	1695	\\pub const is_test = {};
	1696	\\pub const single_threaded = {};
	1697	\\pub const abi = Abi.{};
	1698	\\pub const cpu: Cpu = Cpu{{
	1699	\\ .arch = .{},
	1700	\\ .model = &Target.{}.cpu.{},
	1701	\\ .features = Target.{}.featureSet(&[_]Target.{}.Feature{{
	1702	\\
	1703	, .{
	1704	@tagName(comp.bin_file.options.output_mode),
	1705	@tagName(comp.bin_file.options.link_mode),
	1706	comp.is_test,
	1707	comp.bin_file.options.single_threaded,
	1708	@tagName(target.abi),
	1709	@tagName(target.cpu.arch),
	1710	generic_arch_name,
	1711	target.cpu.model.name,
	1712	generic_arch_name,
	1713	generic_arch_name,
	1714	});
	1715
	1716	for (target.cpu.arch.allFeaturesList()) \|feature, index_usize\| {
	1717	const index = @intCast(std.Target.Cpu.Feature.Set.Index, index_usize);
	1718	const is_enabled = target.cpu.features.isEnabled(index);
	1719	if (is_enabled) {
	1720	// TODO some kind of "zig identifier escape" function rather than
	1721	// unconditionally using @"" syntax
	1722	try buffer.appendSlice(" .@\"");
	1723	try buffer.appendSlice(feature.name);
	1724	try buffer.appendSlice("\",\n");
	1725	}
	1726	}
	1727
	1728	try buffer.writer().print(
	1729	\\ }}),
	1730	\\}};
	1731	\\pub const os = Os{{
	1732	\\ .tag = .{},
	1733	\\ .version_range = .{{
	1734	,
	1735	.{@tagName(target.os.tag)},
	1736	);
	1737
	1738	switch (target.os.getVersionRange()) {
	1739	.none => try buffer.appendSlice(" .none = {} }\n"),
	1740	.semver => \|semver\| try buffer.outStream().print(
	1741	\\ .semver = .{{
	1742	\\ .min = .{{
	1743	\\ .major = {},
	1744	\\ .minor = {},
	1745	\\ .patch = {},
	1746	\\ }},
	1747	\\ .max = .{{
	1748	\\ .major = {},
	1749	\\ .minor = {},
	1750	\\ .patch = {},
	1751	\\ }},
	1752	\\ }}}},
	1753	\\
	1754	, .{
	1755	semver.min.major,
	1756	semver.min.minor,
	1757	semver.min.patch,
	1758
	1759	semver.max.major,
	1760	semver.max.minor,
	1761	semver.max.patch,
	1762	}),
	1763	.linux => \|linux\| try buffer.outStream().print(
	1764	\\ .linux = .{{
	1765	\\ .range = .{{
	1766	\\ .min = .{{
	1767	\\ .major = {},
	1768	\\ .minor = {},
	1769	\\ .patch = {},
	1770	\\ }},
	1771	\\ .max = .{{
	1772	\\ .major = {},
	1773	\\ .minor = {},
	1774	\\ .patch = {},
	1775	\\ }},
	1776	\\ }},
	1777	\\ .glibc = .{{
	1778	\\ .major = {},
	1779	\\ .minor = {},
	1780	\\ .patch = {},
	1781	\\ }},
	1782	\\ }}}},
	1783	\\
	1784	, .{
	1785	linux.range.min.major,
	1786	linux.range.min.minor,
	1787	linux.range.min.patch,
	1788
	1789	linux.range.max.major,
	1790	linux.range.max.minor,
	1791	linux.range.max.patch,
	1792
	1793	linux.glibc.major,
	1794	linux.glibc.minor,
	1795	linux.glibc.patch,
	1796	}),
	1797	.windows => \|windows\| try buffer.outStream().print(
	1798	\\ .windows = .{{
	1799	\\ .min = {s},
	1800	\\ .max = {s},
	1801	\\ }}}},
	1802	\\
	1803	,
	1804	.{ windows.min, windows.max },
	1805	),
	1806	}
	1807	try buffer.appendSlice("};\n");
	1808	try buffer.writer().print(
	1809	\\pub const object_format = ObjectFormat.{};
	1810	\\pub const mode = Mode.{};
	1811	\\pub const link_libc = {};
	1812	\\pub const link_libcpp = {};
	1813	\\pub const have_error_return_tracing = {};
	1814	\\pub const valgrind_support = {};
	1815	\\pub const position_independent_code = {};
	1816	\\pub const strip_debug_info = {};
	1817	\\pub const code_model = CodeModel.{};
	1818	\\
	1819	, .{
	1820	@tagName(comp.bin_file.options.object_format),
	1821	@tagName(comp.bin_file.options.optimize_mode),
	1822	comp.bin_file.options.link_libc,
	1823	comp.bin_file.options.link_libcpp,
	1824	comp.bin_file.options.error_return_tracing,
	1825	comp.bin_file.options.valgrind,
	1826	comp.bin_file.options.pic,
	1827	comp.bin_file.options.strip,
	1828	@tagName(comp.bin_file.options.machine_code_model),
	1829	});
	1830	return buffer.toOwnedSlice();
	1831	}

src-self-hosted/glibc.zig+4-4

...	...	@@ -711,8 +711,8 @@ fn build_crt_file(
711	711	.is_native_os = comp.bin_file.options.is_native_os,
712	712	.self_exe_path = comp.self_exe_path,
713	713	.c_source_files = c_source_files,
714		.debug_cc = comp.debug_cc,
715		.debug_link = comp.bin_file.options.debug_link,
	714	.verbose_cc = comp.verbose_cc,
	715	.verbose_link = comp.bin_file.options.verbose_link,
716	716	.clang_passthrough_mode = comp.clang_passthrough_mode,
717	717	});
718	718	defer sub_compilation.destroy();
...	...	@@ -987,8 +987,8 @@ fn buildSharedLib(
987	987	.strip = comp.bin_file.options.strip,
988	988	.is_native_os = false,
989	989	.self_exe_path = comp.self_exe_path,
990		.debug_cc = comp.debug_cc,
991		.debug_link = comp.bin_file.options.debug_link,
	990	.verbose_cc = comp.verbose_cc,
	991	.verbose_link = comp.bin_file.options.verbose_link,
992	992	.clang_passthrough_mode = comp.clang_passthrough_mode,
993	993	.version = version,
994	994	.version_script = map_file_path,

src-self-hosted/libunwind.zig+2-2

...	...	@@ -107,8 +107,8 @@ pub fn buildStaticLib(comp: *Compilation) !void {
107	107	.is_native_os = comp.bin_file.options.is_native_os,
108	108	.self_exe_path = comp.self_exe_path,
109	109	.c_source_files = &c_source_files,
110		.debug_cc = comp.debug_cc,
111		.debug_link = comp.bin_file.options.debug_link,
	110	.verbose_cc = comp.verbose_cc,
	111	.verbose_link = comp.bin_file.options.verbose_link,
112	112	.clang_passthrough_mode = comp.clang_passthrough_mode,
113	113	.link_libc = true,
114	114	});

src-self-hosted/link.zig+3-2

...	...	@@ -61,8 +61,9 @@ pub const Options = struct {
61	61	valgrind: bool,
62	62	stack_check: bool,
63	63	single_threaded: bool,
64		debug_link: bool = false,
	64	verbose_link: bool = false,
65	65	dll_export_fns: bool,
	66	error_return_tracing: bool,
66	67	gc_sections: ?bool = null,
67	68	allow_shlib_undefined: ?bool = null,
68	69	linker_script: ?[]const u8 = null,
...	...	@@ -441,7 +442,7 @@ pub const File = struct {
441	442	base.options.sub_path;
442	443	const full_out_path_z = try arena.dupeZ(u8, full_out_path);
443	444
444		if (base.options.debug_link) {
	445	if (base.options.verbose_link) {
445	446	std.debug.print("ar rcs {}", .{full_out_path_z});
446	447	for (object_files.items) \|arg\| {
447	448	std.debug.print(" {}", .{arg});

src-self-hosted/link/Elf.zig+1-1

...	...	@@ -1569,7 +1569,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {
1569	1569	try argv.append("-Bsymbolic");
1570	1570	}
1571	1571
1572		if (self.base.options.debug_link) {
	1572	if (self.base.options.verbose_link) {
1573	1573	for (argv.items[0 .. argv.items.len - 1]) \|arg\| {
1574	1574	std.debug.print("{} ", .{arg});
1575	1575	}

src-self-hosted/main.zig+28-15

...	...	@@ -179,6 +179,7 @@ const usage_build_generic =
179	179	\\ --color [auto\|off\|on] Enable or disable colored error messages
180	180	\\ -femit-bin[=path] (default) output machine code
181	181	\\ -fno-emit-bin Do not output machine code
	182	\\ --show-builtin Output the source of @import("builtin") then exit
182	183	\\
183	184	\\Compile Options:
184	185	\\ -target [name] <arch><sub>-<os>-<abi> see the targets command
...	...	@@ -233,8 +234,8 @@ const usage_build_generic =
233	234	\\
234	235	\\Debug Options (Zig Compiler Development):
235	236	\\ -ftime-report Print timing diagnostics
236		\\ --debug-link Verbose linker invocation
237		\\ --debug-cc Verbose C compiler invocation
	237	\\ --verbose-link Display linker invocations
	238	\\ --verbose-cc Display C compiler invocations
238	239	\\
239	240	;
240	241
...	...	@@ -274,9 +275,10 @@ pub fn buildOutputType(
274	275	var strip = false;
275	276	var single_threaded = false;
276	277	var watch = false;
277		var debug_link = false;
278		var debug_cc = false;
	278	var verbose_link = false;
	279	var verbose_cc = false;
279	280	var time_report = false;
	281	var show_builtin = false;
280	282	var emit_bin: Emit = .yes_default_path;
281	283	var emit_zir: Emit = .no;
282	284	var target_arch_os_abi: []const u8 = "native";
...	...	@@ -531,6 +533,8 @@ pub fn buildOutputType(
531	533	dll_export_fns = true;
532	534	} else if (mem.eql(u8, arg, "-fno-dll-export-fns")) {
533	535	dll_export_fns = false;
	536	} else if (mem.eql(u8, arg, "--show-builtin")) {
	537	show_builtin = true;
534	538	} else if (mem.eql(u8, arg, "--strip")) {
535	539	strip = true;
536	540	} else if (mem.eql(u8, arg, "--single-threaded")) {
...	...	@@ -539,10 +543,10 @@ pub fn buildOutputType(
539	543	link_eh_frame_hdr = true;
540	544	} else if (mem.eql(u8, arg, "-Bsymbolic")) {
541	545	linker_bind_global_refs_locally = true;
542		} else if (mem.eql(u8, arg, "--debug-link")) {
543		debug_link = true;
544		} else if (mem.eql(u8, arg, "--debug-cc")) {
545		debug_cc = true;
	546	} else if (mem.eql(u8, arg, "--verbose-link")) {
	547	verbose_link = true;
	548	} else if (mem.eql(u8, arg, "--verbose-cc")) {
	549	verbose_cc = true;
546	550	} else if (mem.startsWith(u8, arg, "-T")) {
547	551	linker_script = arg[2..];
548	552	} else if (mem.startsWith(u8, arg, "-L")) {
...	...	@@ -680,8 +684,8 @@ pub fn buildOutputType(
680	684	},
681	685	.linker_script => linker_script = it.only_arg,
682	686	.verbose_cmds => {
683		debug_cc = true;
684		debug_link = true;
	687	verbose_cc = true;
	688	verbose_link = true;
685	689	},
686	690	.for_linker => try linker_args.append(it.only_arg),
687	691	.linker_input_z => {
...	...	@@ -873,6 +877,8 @@ pub fn buildOutputType(
873	877	} else if (emit_bin == .yes) {
874	878	const basename = fs.path.basename(emit_bin.yes);
875	879	break :blk mem.split(basename, ".").next().?;
	880	} else if (show_builtin) {
	881	break :blk "builtin";
876	882	} else {
877	883	fatal("--name [name] not provided and unable to infer", .{});
878	884	}
...	...	@@ -1160,17 +1166,20 @@ pub fn buildOutputType(
1160	1166	.clang_passthrough_mode = arg_mode != .build,
1161	1167	.version = if (have_version) version else null,
1162	1168	.libc_installation = if (libc_installation) \|*lci\| lci else null,
1163		.debug_cc = debug_cc,
1164		.debug_link = debug_link,
	1169	.verbose_cc = verbose_cc,
	1170	.verbose_link = verbose_link,
1165	1171	.machine_code_model = machine_code_model,
1166	1172	}) catch \|err\| {
1167	1173	fatal("unable to create compilation: {}", .{@errorName(err)});
1168	1174	};
1169	1175	defer comp.destroy();
1170	1176
1171		const stdin = std.io.getStdIn().inStream();
1172		const stderr = std.io.getStdErr().outStream();
1173		var repl_buf: [1024]u8 = undefined;
	1177	if (show_builtin) {
	1178	const source = try comp.generateBuiltinZigSource();
	1179	defer comp.gpa.free(source);
	1180	try std.io.getStdOut().writeAll(source);
	1181	return;
	1182	}
1174	1183
1175	1184	try updateModule(gpa, comp, zir_out_path);
1176	1185
...	...	@@ -1179,6 +1188,10 @@ pub fn buildOutputType(
1179	1188	fatal("TODO: implement `zig cc` when using it as a preprocessor", .{});
1180	1189	}
1181	1190
	1191	const stdin = std.io.getStdIn().inStream();
	1192	const stderr = std.io.getStdErr().outStream();
	1193	var repl_buf: [1024]u8 = undefined;
	1194
1182	1195	while (watch) {
1183	1196	try stderr.print("🦎 ", .{});
1184	1197	if (output_mode == .Exe) {

src/all_types.hpp-2

...	...	@@ -2161,11 +2161,9 @@ struct CodeGen {
2161	2161	bool have_err_ret_tracing;
2162	2162	bool verbose_tokenize;
2163	2163	bool verbose_ast;
2164		bool verbose_link;
2165	2164	bool verbose_ir;
2166	2165	bool verbose_llvm_ir;
2167	2166	bool verbose_cimport;
2168		bool verbose_cc;
2169	2167	bool verbose_llvm_cpu_features;
2170	2168	bool error_during_imports;
2171	2169	bool generate_error_name_table;

src/stage1.cpp-2

...	...	@@ -104,11 +104,9 @@ void zig_stage1_build_object(struct ZigStage1 *stage1) {
104	104
105	105	g->verbose_tokenize = stage1->verbose_tokenize;
106	106	g->verbose_ast = stage1->verbose_ast;
107		g->verbose_link = stage1->verbose_link;
108	107	g->verbose_ir = stage1->verbose_ir;
109	108	g->verbose_llvm_ir = stage1->verbose_llvm_ir;
110	109	g->verbose_cimport = stage1->verbose_cimport;
111		g->verbose_cc = stage1->verbose_cc;
112	110	g->verbose_llvm_cpu_features = stage1->verbose_llvm_cpu_features;
113	111
114	112	g->err_color = stage1->err_color;

src/stage1.h-2

...	...	@@ -194,11 +194,9 @@ struct ZigStage1 {
194	194	bool test_is_evented;
195	195	bool verbose_tokenize;
196	196	bool verbose_ast;
197		bool verbose_link;
198	197	bool verbose_ir;
199	198	bool verbose_llvm_ir;
200	199	bool verbose_cimport;
201		bool verbose_cc;
202	200	bool verbose_llvm_cpu_features;
203	201	};
204	202

src/zig0.cpp-10

...	...	@@ -44,11 +44,9 @@ static int print_full_usage(const char arg0, FILE file, int return_code) {
44	44	" -mcpu [cpu] specify target CPU and feature set\n"
45	45	" --verbose-tokenize enable compiler debug output for tokenization\n"
46	46	" --verbose-ast enable compiler debug output for AST parsing\n"
47		" --verbose-link enable compiler debug output for linking\n"
48	47	" --verbose-ir enable compiler debug output for Zig IR\n"
49	48	" --verbose-llvm-ir enable compiler debug output for LLVM IR\n"
50	49	" --verbose-cimport enable compiler debug output for C imports\n"
51		" --verbose-cc enable compiler debug output for C compilation\n"
52	50	" --verbose-llvm-cpu-features enable compiler debug output for LLVM CPU features\n"
53	51	"\n"
54	52	, arg0);
...	...	@@ -82,11 +80,9 @@ int main(int argc, char **argv) {
82	80	const char *out_name = nullptr;
83	81	bool verbose_tokenize = false;
84	82	bool verbose_ast = false;
85		bool verbose_link = false;
86	83	bool verbose_ir = false;
87	84	bool verbose_llvm_ir = false;
88	85	bool verbose_cimport = false;
89		bool verbose_cc = false;
90	86	bool verbose_llvm_cpu_features = false;
91	87	ErrColor color = ErrColorAuto;
92	88	const char *dynamic_linker = nullptr;
...	...	@@ -120,16 +116,12 @@ int main(int argc, char **argv) {
120	116	verbose_tokenize = true;
121	117	} else if (strcmp(arg, "--verbose-ast") == 0) {
122	118	verbose_ast = true;
123		} else if (strcmp(arg, "--verbose-link") == 0) {
124		verbose_link = true;
125	119	} else if (strcmp(arg, "--verbose-ir") == 0) {
126	120	verbose_ir = true;
127	121	} else if (strcmp(arg, "--verbose-llvm-ir") == 0) {
128	122	verbose_llvm_ir = true;
129	123	} else if (strcmp(arg, "--verbose-cimport") == 0) {
130	124	verbose_cimport = true;
131		} else if (strcmp(arg, "--verbose-cc") == 0) {
132		verbose_cc = true;
133	125	} else if (strcmp(arg, "--verbose-llvm-cpu-features") == 0) {
134	126	verbose_llvm_cpu_features = true;
135	127	} else if (arg[1] == 'l' && arg[2] != 0) {
...	...	@@ -283,11 +275,9 @@ int main(int argc, char **argv) {
283	275	stage1->strip = strip;
284	276	stage1->verbose_tokenize = verbose_tokenize;
285	277	stage1->verbose_ast = verbose_ast;
286		stage1->verbose_link = verbose_link;
287	278	stage1->verbose_ir = verbose_ir;
288	279	stage1->verbose_llvm_ir = verbose_llvm_ir;
289	280	stage1->verbose_cimport = verbose_cimport;
290		stage1->verbose_cc = verbose_cc;
291	281	stage1->verbose_llvm_cpu_features = verbose_llvm_cpu_features;
292	282	stage1->output_dir_ptr = output_dir;
293	283	stage1->output_dir_len = strlen(output_dir);