Commit b097545a5f2b01392c60014e1caded9dccc4b34d | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-11-26 19:59:33-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-11-26 19:59:33-07:00
log	b097545a5f2b01392c60014e1caded9dccc4b34d
tree	5e3dfe2fb35fa1cc121cf1c4a26839ac64113f40
parent	eec825cea21048461aa4bb6a057e7179d9a118bc

zig cc: honor all -m and -mno- CPU feature flags

closes #9196

5 files changed, 453 insertions(+), 320 deletions(-)

lib
- std
  - zig
    cross_target.zig
src
tools
- update_clang_options.zig

lib/std/zig/cross_target.zig+15

...	@@ -323,6 +323,21 @@ pub const CrossTarget = struct {	...	@@ -323,6 +323,21 @@ pub const CrossTarget = struct {
323	return result;	323	return result;
324	}	324	}
325		325
		326	/// Similar to `parse` except instead of fully parsing, it only determines the CPU
		327	/// architecture and returns it if it can be determined, and returns `null` otherwise.
		328	/// This is intended to be used if the API user of CrossTarget needs to learn the
		329	/// target CPU architecture in order to fully populate `ParseOptions`.
		330	pub fn parseCpuArch(args: ParseOptions) ?Target.Cpu.Arch {
		331	var it = mem.split(u8, args.arch_os_abi, "-");
		332	const arch_name = it.next().?;
		333	const arch_is_native = mem.eql(u8, arch_name, "native");
		334	if (arch_is_native) {
		335	return builtin.cpu.arch;
		336	} else {
		337	return std.meta.stringToEnum(Target.Cpu.Arch, arch_name);
		338	}
		339	}
		340
326	/// TODO deprecated, use `std.zig.system.NativeTargetInfo.detect`.	341	/// TODO deprecated, use `std.zig.system.NativeTargetInfo.detect`.
327	pub fn getCpu(self: CrossTarget) Target.Cpu {	342	pub fn getCpu(self: CrossTarget) Target.Cpu {
328	switch (self.cpu_model) {	343	switch (self.cpu_model) {

src/clang_options.zig+10

...	@@ -132,3 +132,13 @@ pub fn sepd1(name: []const u8) CliArg {	...	@@ -132,3 +132,13 @@ pub fn sepd1(name: []const u8) CliArg {
132	.pd1 = true,	132	.pd1 = true,
133	};	133	};
134	}	134	}
		135
		136	/// Shortcut function for initializing a `CliArg`
		137	pub fn m(name: []const u8) CliArg {
		138	return .{
		139	.name = name,
		140	.syntax = .flag,
		141	.zig_equivalent = .m,
		142	.pd1 = true,
		143	};
		144	}

src/clang_options_data.zig+309-308

...	@@ -7,6 +7,7 @@ const flagpsl = clang_options.flagpsl;	...	@@ -7,6 +7,7 @@ const flagpsl = clang_options.flagpsl;
7	const joinpd1 = clang_options.joinpd1;	7	const joinpd1 = clang_options.joinpd1;
8	const jspd1 = clang_options.jspd1;	8	const jspd1 = clang_options.jspd1;
9	const sepd1 = clang_options.sepd1;	9	const sepd1 = clang_options.sepd1;
		10	const m = clang_options.m;
10	pub const data = blk: { @setEvalBranchQuota(6000); break :blk &[_]CliArg{	11	pub const data = blk: { @setEvalBranchQuota(6000); break :blk &[_]CliArg{
11	flagpd1("C"),	12	flagpd1("C"),
12	flagpd1("CC"),	13	flagpd1("CC"),
...	@@ -3771,8 +3772,8 @@ sepd1("lazy_library"),	...	@@ -3771,8 +3772,8 @@ sepd1("lazy_library"),
3771	sepd1("load"),	3772	sepd1("load"),
3772	flagpd1("m16"),	3773	flagpd1("m16"),
3773	flagpd1("m32"),	3774	flagpd1("m32"),
3774	flagpd1("m3dnow"),	3775	m("m3dnow"),
3775	flagpd1("m3dnowa"),	3776	m("m3dnowa"),
3776	flagpd1("m64"),	3777	flagpd1("m64"),
3777	flagpd1("m68000"),	3778	flagpd1("m68000"),
3778	flagpd1("m68010"),	3779	flagpd1("m68010"),
...	@@ -3781,110 +3782,110 @@ flagpd1("m68030"),	...	@@ -3781,110 +3782,110 @@ flagpd1("m68030"),
3781	flagpd1("m68040"),	3782	flagpd1("m68040"),
3782	flagpd1("m68060"),	3783	flagpd1("m68060"),
3783	flagpd1("m80387"),	3784	flagpd1("m80387"),
3784	flagpd1("mseses"),	3785	m("mseses"),
3785	flagpd1("mabi=ieeelongdouble"),	3786	flagpd1("mabi=ieeelongdouble"),
3786	flagpd1("mabi=vec-default"),	3787	flagpd1("mabi=vec-default"),
3787	flagpd1("mabi=vec-extabi"),	3788	flagpd1("mabi=vec-extabi"),
3788	flagpd1("mabicalls"),	3789	flagpd1("mabicalls"),
3789	flagpd1("madx"),	3790	m("madx"),
3790	flagpd1("maes"),	3791	m("maes"),
3791	sepd1("main-file-name"),	3792	sepd1("main-file-name"),
3792	flagpd1("maix-struct-return"),	3793	flagpd1("maix-struct-return"),
3793	flagpd1("malign-double"),	3794	flagpd1("malign-double"),
3794	flagpd1("maltivec"),	3795	m("maltivec"),
3795	flagpd1("mamdgpu-ieee"),	3796	flagpd1("mamdgpu-ieee"),
3796	flagpd1("mamx-bf16"),	3797	m("mamx-bf16"),
3797	flagpd1("mamx-tile"),	3798	m("mamx-tile"),
3798	flagpd1("marm"),	3799	flagpd1("marm"),
3799	flagpd1("massembler-fatal-warnings"),	3800	flagpd1("massembler-fatal-warnings"),
3800	flagpd1("massembler-no-warn"),	3801	flagpd1("massembler-no-warn"),
3801	flagpd1("matomics"),	3802	m("matomics"),
3802	flagpd1("mavx"),	3803	m("mavx"),
3803	flagpd1("mavx2"),	3804	m("mavx2"),
3804	flagpd1("mavx512bf16"),	3805	m("mavx512bf16"),
3805	flagpd1("mavx512bitalg"),	3806	m("mavx512bitalg"),
3806	flagpd1("mavx512bw"),	3807	m("mavx512bw"),
3807	flagpd1("mavx512cd"),	3808	m("mavx512cd"),
3808	flagpd1("mavx512dq"),	3809	m("mavx512dq"),
3809	flagpd1("mavx512er"),	3810	m("mavx512er"),
3810	flagpd1("mavx512f"),	3811	m("mavx512f"),
3811	flagpd1("mavx512ifma"),	3812	m("mavx512ifma"),
3812	flagpd1("mavx512pf"),	3813	m("mavx512pf"),
3813	flagpd1("mavx512vbmi"),	3814	m("mavx512vbmi"),
3814	flagpd1("mavx512vbmi2"),	3815	m("mavx512vbmi2"),
3815	flagpd1("mavx512vl"),	3816	m("mavx512vl"),
3816	flagpd1("mavx512vnni"),	3817	m("mavx512vnni"),
3817	flagpd1("mavx512vp2intersect"),	3818	m("mavx512vp2intersect"),
3818	flagpd1("mavx512vpopcntdq"),	3819	m("mavx512vpopcntdq"),
3819	flagpd1("mavxvnni"),	3820	m("mavxvnni"),
3820	flagpd1("mbackchain"),	3821	flagpd1("mbackchain"),
3821	flagpd1("mbig-endian"),	3822	flagpd1("mbig-endian"),
3822	flagpd1("mbmi"),	3823	m("mbmi"),
3823	flagpd1("mbmi2"),	3824	m("mbmi2"),
3824	flagpd1("mbranch-likely"),	3825	flagpd1("mbranch-likely"),
3825	flagpd1("mbranch-target-enforce"),	3826	flagpd1("mbranch-target-enforce"),
3826	flagpd1("mbranches-within-32B-boundaries"),	3827	flagpd1("mbranches-within-32B-boundaries"),
3827	flagpd1("mbulk-memory"),	3828	m("mbulk-memory"),
3828	flagpd1("mcheck-zero-division"),	3829	flagpd1("mcheck-zero-division"),
3829	flagpd1("mcldemote"),	3830	m("mcldemote"),
3830	flagpd1("mclflushopt"),	3831	m("mclflushopt"),
3831	flagpd1("mclwb"),	3832	m("mclwb"),
3832	flagpd1("mclzero"),	3833	m("mclzero"),
3833	flagpd1("mcmodel=medany"),	3834	flagpd1("mcmodel=medany"),
3834	flagpd1("mcmodel=medlow"),	3835	flagpd1("mcmodel=medlow"),
3835	flagpd1("mcmpb"),	3836	m("mcmpb"),
3836	flagpd1("mcmse"),	3837	flagpd1("mcmse"),
3837	flagpd1("mcode-object-v3"),	3838	flagpd1("mcode-object-v3"),
3838	flagpd1("mconstant-cfstrings"),	3839	flagpd1("mconstant-cfstrings"),
3839	flagpd1("mconstructor-aliases"),	3840	flagpd1("mconstructor-aliases"),
3840	flagpd1("mcpu=?"),	3841	flagpd1("mcpu=?"),
3841	flagpd1("mcrbits"),	3842	m("mcrbits"),
3842	flagpd1("mcrc"),	3843	m("mcrc"),
3843	flagpd1("mcumode"),	3844	m("mcumode"),
3844	flagpd1("mcx16"),	3845	m("mcx16"),
3845	sepd1("mdebug-pass"),	3846	sepd1("mdebug-pass"),
3846	flagpd1("mdirect-move"),	3847	m("mdirect-move"),
3847	flagpd1("mdisable-tail-calls"),	3848	flagpd1("mdisable-tail-calls"),
3848	flagpd1("mdouble-float"),	3849	flagpd1("mdouble-float"),
3849	flagpd1("mdsp"),	3850	m("mdsp"),
3850	flagpd1("mdspr2"),	3851	m("mdspr2"),
3851	sepd1("meabi"),	3852	sepd1("meabi"),
3852	flagpd1("mefpu2"),	3853	m("mefpu2"),
3853	flagpd1("membedded-data"),	3854	flagpd1("membedded-data"),
3854	flagpd1("menable-experimental-extensions"),	3855	flagpd1("menable-experimental-extensions"),
3855	flagpd1("menable-no-infs"),	3856	flagpd1("menable-no-infs"),
3856	flagpd1("menable-no-nans"),	3857	flagpd1("menable-no-nans"),
3857	flagpd1("menable-unsafe-fp-math"),	3858	flagpd1("menable-unsafe-fp-math"),
3858	flagpd1("menqcmd"),	3859	m("menqcmd"),
3859	flagpd1("mexception-handling"),	3860	m("mexception-handling"),
3860	flagpd1("mexecute-only"),	3861	m("mexecute-only"),
3861	flagpd1("mextern-sdata"),	3862	flagpd1("mextern-sdata"),
3862	flagpd1("mf16c"),	3863	m("mf16c"),
3863	flagpd1("mfancy-math-387"),	3864	flagpd1("mfancy-math-387"),
3864	flagpd1("mfentry"),	3865	flagpd1("mfentry"),
3865	flagpd1("mfix-and-continue"),	3866	flagpd1("mfix-and-continue"),
3866	flagpd1("mfix-cortex-a53-835769"),	3867	flagpd1("mfix-cortex-a53-835769"),
3867	flagpd1("mfloat128"),	3868	m("mfloat128"),
3868	sepd1("mfloat-abi"),	3869	sepd1("mfloat-abi"),
3869	flagpd1("mfma"),	3870	m("mfma"),
3870	flagpd1("mfma4"),	3871	m("mfma4"),
3871	flagpd1("mfp32"),	3872	flagpd1("mfp32"),
3872	flagpd1("mfp64"),	3873	m("mfp64"),
3873	sepd1("mfpmath"),	3874	sepd1("mfpmath"),
3874	flagpd1("mfprnd"),	3875	m("mfprnd"),
3875	flagpd1("mfpxx"),	3876	m("mfpxx"),
3876	flagpd1("mfsgsbase"),	3877	m("mfsgsbase"),
3877	flagpd1("mfxsr"),	3878	m("mfxsr"),
3878	flagpd1("mgeneral-regs-only"),	3879	flagpd1("mgeneral-regs-only"),
3879	flagpd1("mgfni"),	3880	m("mgfni"),
3880	flagpd1("mginv"),	3881	m("mginv"),
3881	flagpd1("mglibc"),	3882	flagpd1("mglibc"),
3882	flagpd1("mglobal-merge"),	3883	flagpd1("mglobal-merge"),
3883	flagpd1("mgpopt"),	3884	flagpd1("mgpopt"),
3884	flagpd1("mhard-float"),	3885	m("mhard-float"),
3885	flagpd1("mhvx"),	3886	m("mhvx"),
3886	flagpd1("mhreset"),	3887	m("mhreset"),
3887	flagpd1("mhtm"),	3888	m("mhtm"),
3888	flagpd1("miamcu"),	3889	flagpd1("miamcu"),
3889	flagpd1("mieee-fp"),	3890	flagpd1("mieee-fp"),
3890	flagpd1("mieee-rnd-near"),	3891	flagpd1("mieee-rnd-near"),
...	@@ -3895,8 +3896,8 @@ flagpd1("no-ns-alloc-error"),	...	@@ -3895,8 +3896,8 @@ flagpd1("no-ns-alloc-error"),
3895	flagpd1("mimplicit-float"),	3896	flagpd1("mimplicit-float"),
3896	flagpd1("mincremental-linker-compatible"),	3897	flagpd1("mincremental-linker-compatible"),
3897	flagpd1("minline-all-stringops"),	3898	flagpd1("minline-all-stringops"),
3898	flagpd1("minvariant-function-descriptors"),	3899	m("minvariant-function-descriptors"),
3899	flagpd1("minvpcid"),	3900	m("minvpcid"),
3900	flagpd1("mips1"),	3901	flagpd1("mips1"),
3901	flagpd1("mips16"),	3902	flagpd1("mips16"),
3902	flagpd1("mips2"),	3903	flagpd1("mips2"),
...	@@ -3913,9 +3914,9 @@ flagpd1("mips64r2"),	...	@@ -3913,9 +3914,9 @@ flagpd1("mips64r2"),
3913	flagpd1("mips64r3"),	3914	flagpd1("mips64r3"),
3914	flagpd1("mips64r5"),	3915	flagpd1("mips64r5"),
3915	flagpd1("mips64r6"),	3916	flagpd1("mips64r6"),
3916	flagpd1("misel"),	3917	m("misel"),
3917	flagpd1("mkernel"),	3918	flagpd1("mkernel"),
3918	flagpd1("mkl"),	3919	m("mkl"),
3919	flagpd1("mldc1-sdc1"),	3920	flagpd1("mldc1-sdc1"),
3920	sepd1("mlimit-float-precision"),	3921	sepd1("mlimit-float-precision"),
3921	sepd1("mlink-bitcode-file"),	3922	sepd1("mlink-bitcode-file"),
...	@@ -3924,166 +3925,166 @@ sepd1("mlink-cuda-bitcode"),	...	@@ -3924,166 +3925,166 @@ sepd1("mlink-cuda-bitcode"),
3924	flagpd1("mlittle-endian"),	3925	flagpd1("mlittle-endian"),
3925	sepd1("mllvm"),	3926	sepd1("mllvm"),
3926	flagpd1("mlocal-sdata"),	3927	flagpd1("mlocal-sdata"),
3927	flagpd1("mlong-calls"),	3928	m("mlong-calls"),
3928	flagpd1("mlong-double-128"),	3929	flagpd1("mlong-double-128"),
3929	flagpd1("mlong-double-64"),	3930	flagpd1("mlong-double-64"),
3930	flagpd1("mlong-double-80"),	3931	flagpd1("mlong-double-80"),
3931	flagpd1("mlongcall"),	3932	m("mlongcall"),
3932	flagpd1("mlvi-cfi"),	3933	m("mlvi-cfi"),
3933	flagpd1("mlvi-hardening"),	3934	flagpd1("mlvi-hardening"),
3934	flagpd1("mlwp"),	3935	m("mlwp"),
3935	flagpd1("mlzcnt"),	3936	m("mlzcnt"),
3936	flagpd1("mmadd4"),	3937	flagpd1("mmadd4"),
3937	flagpd1("mmark-bti-property"),	3938	flagpd1("mmark-bti-property"),
3938	flagpd1("mmemops"),	3939	m("mmemops"),
3939	flagpd1("mmfcrf"),	3940	flagpd1("mmfcrf"),
3940	flagpd1("mmfocrf"),	3941	m("mmfocrf"),
3941	flagpd1("mmicromips"),	3942	m("mmicromips"),
3942	flagpd1("mmma"),	3943	m("mmma"),
3943	flagpd1("mmmx"),	3944	m("mmmx"),
3944	flagpd1("mmovbe"),	3945	m("mmovbe"),
3945	flagpd1("mmovdir64b"),	3946	m("mmovdir64b"),
3946	flagpd1("mmovdiri"),	3947	m("mmovdiri"),
3947	flagpd1("mmpx"),	3948	flagpd1("mmpx"),
3948	flagpd1("mms-bitfields"),	3949	flagpd1("mms-bitfields"),
3949	flagpd1("mmsa"),	3950	m("mmsa"),
3950	flagpd1("mmt"),	3951	m("mmt"),
3951	flagpd1("mmultivalue"),	3952	m("mmultivalue"),
3952	flagpd1("mmutable-globals"),	3953	m("mmutable-globals"),
3953	flagpd1("mmwaitx"),	3954	m("mmwaitx"),
3954	flagpd1("mno-3dnow"),	3955	m("mno-3dnow"),
3955	flagpd1("mno-3dnowa"),	3956	m("mno-3dnowa"),
3956	flagpd1("mno-80387"),	3957	flagpd1("mno-80387"),
3957	flagpd1("mno-abicalls"),	3958	flagpd1("mno-abicalls"),
3958	flagpd1("mno-adx"),	3959	m("mno-adx"),
3959	flagpd1("mno-aes"),	3960	m("mno-aes"),
3960	flagpd1("mno-altivec"),	3961	m("mno-altivec"),
3961	flagpd1("mno-amdgpu-ieee"),	3962	flagpd1("mno-amdgpu-ieee"),
3962	flagpd1("mno-amx-bf16"),	3963	m("mno-amx-bf16"),
3963	flagpd1("mno-amx-int8"),	3964	m("mno-amx-int8"),
3964	flagpd1("mno-amx-tile"),	3965	m("mno-amx-tile"),
3965	flagpd1("mno-atomics"),	3966	m("mno-atomics"),
3966	flagpd1("mno-avx"),	3967	m("mno-avx"),
3967	flagpd1("mno-avx2"),	3968	m("mno-avx2"),
3968	flagpd1("mno-avx512bf16"),	3969	m("mno-avx512bf16"),
3969	flagpd1("mno-avx512bitalg"),	3970	m("mno-avx512bitalg"),
3970	flagpd1("mno-avx512bw"),	3971	m("mno-avx512bw"),
3971	flagpd1("mno-avx512cd"),	3972	m("mno-avx512cd"),
3972	flagpd1("mno-avx512dq"),	3973	m("mno-avx512dq"),
3973	flagpd1("mno-avx512er"),	3974	m("mno-avx512er"),
3974	flagpd1("mno-avx512f"),	3975	m("mno-avx512f"),
3975	flagpd1("mno-avx512ifma"),	3976	m("mno-avx512ifma"),
3976	flagpd1("mno-avx512pf"),	3977	m("mno-avx512pf"),
3977	flagpd1("mno-avx512vbmi"),	3978	m("mno-avx512vbmi"),
3978	flagpd1("mno-avx512vbmi2"),	3979	m("mno-avx512vbmi2"),
3979	flagpd1("mno-avx512vl"),	3980	m("mno-avx512vl"),
3980	flagpd1("mno-avx512vnni"),	3981	m("mno-avx512vnni"),
3981	flagpd1("mno-avx512vp2intersect"),	3982	m("mno-avx512vp2intersect"),
3982	flagpd1("mno-avx512vpopcntdq"),	3983	m("mno-avx512vpopcntdq"),
3983	flagpd1("mno-avxvnni"),	3984	m("mno-avxvnni"),
3984	flagpd1("mno-backchain"),	3985	flagpd1("mno-backchain"),
3985	flagpd1("mno-bmi"),	3986	m("mno-bmi"),
3986	flagpd1("mno-bmi2"),	3987	m("mno-bmi2"),
3987	flagpd1("mno-branch-likely"),	3988	flagpd1("mno-branch-likely"),
3988	flagpd1("mno-bulk-memory"),	3989	m("mno-bulk-memory"),
3989	flagpd1("mno-check-zero-division"),	3990	flagpd1("mno-check-zero-division"),
3990	flagpd1("mno-cldemote"),	3991	m("mno-cldemote"),
3991	flagpd1("mno-clflushopt"),	3992	m("mno-clflushopt"),
3992	flagpd1("mno-clwb"),	3993	m("mno-clwb"),
3993	flagpd1("mno-clzero"),	3994	m("mno-clzero"),
3994	flagpd1("mno-cmpb"),	3995	m("mno-cmpb"),
3995	flagpd1("mno-code-object-v3"),	3996	flagpd1("mno-code-object-v3"),
3996	flagpd1("mno-constant-cfstrings"),	3997	flagpd1("mno-constant-cfstrings"),
3997	flagpd1("mno-crbits"),	3998	m("mno-crbits"),
3998	flagpd1("mno-crc"),	3999	m("mno-crc"),
3999	flagpd1("mno-cumode"),	4000	m("mno-cumode"),
4000	flagpd1("mno-cx16"),	4001	m("mno-cx16"),
4001	flagpd1("mno-dsp"),	4002	m("mno-dsp"),
4002	flagpd1("mno-dspr2"),	4003	m("mno-dspr2"),
4003	flagpd1("mno-embedded-data"),	4004	flagpd1("mno-embedded-data"),
4004	flagpd1("mno-enqcmd"),	4005	m("mno-enqcmd"),
4005	flagpd1("mno-exception-handling"),	4006	m("mno-exception-handling"),
4006	flagpd1("mnoexecstack"),	4007	flagpd1("mnoexecstack"),
4007	flagpd1("mno-execute-only"),	4008	m("mno-execute-only"),
4008	flagpd1("mno-extern-sdata"),	4009	flagpd1("mno-extern-sdata"),
4009	flagpd1("mno-f16c"),	4010	m("mno-f16c"),
4010	flagpd1("mno-fix-cortex-a53-835769"),	4011	flagpd1("mno-fix-cortex-a53-835769"),
4011	flagpd1("mno-float128"),	4012	m("mno-float128"),
4012	flagpd1("mno-fma"),	4013	m("mno-fma"),
4013	flagpd1("mno-fma4"),	4014	m("mno-fma4"),
4014	flagpd1("mno-fprnd"),	4015	m("mno-fprnd"),
4015	flagpd1("mno-fsgsbase"),	4016	m("mno-fsgsbase"),
4016	flagpd1("mno-fxsr"),	4017	m("mno-fxsr"),
4017	flagpd1("mno-gfni"),	4018	m("mno-gfni"),
4018	flagpd1("mno-ginv"),	4019	m("mno-ginv"),
4019	flagpd1("mno-global-merge"),	4020	flagpd1("mno-global-merge"),
4020	flagpd1("mno-gpopt"),	4021	flagpd1("mno-gpopt"),
4021	flagpd1("mno-hvx"),	4022	m("mno-hvx"),
4022	flagpd1("mno-hreset"),	4023	m("mno-hreset"),
4023	flagpd1("mno-htm"),	4024	m("mno-htm"),
4024	flagpd1("mno-iamcu"),	4025	flagpd1("mno-iamcu"),
4025	flagpd1("mno-implicit-float"),	4026	flagpd1("mno-implicit-float"),
4026	flagpd1("mno-incremental-linker-compatible"),	4027	flagpd1("mno-incremental-linker-compatible"),
4027	flagpd1("mno-inline-all-stringops"),	4028	flagpd1("mno-inline-all-stringops"),
4028	flagpd1("mno-invariant-function-descriptors"),	4029	m("mno-invariant-function-descriptors"),
4029	flagpd1("mno-invpcid"),	4030	m("mno-invpcid"),
4030	flagpd1("mno-isel"),	4031	m("mno-isel"),
4031	flagpd1("mno-kl"),	4032	m("mno-kl"),
4032	flagpd1("mno-ldc1-sdc1"),	4033	flagpd1("mno-ldc1-sdc1"),
4033	flagpd1("mno-local-sdata"),	4034	flagpd1("mno-local-sdata"),
4034	flagpd1("mno-long-calls"),	4035	m("mno-long-calls"),
4035	flagpd1("mno-longcall"),	4036	m("mno-longcall"),
4036	flagpd1("mno-lvi-cfi"),	4037	m("mno-lvi-cfi"),
4037	flagpd1("mno-lvi-hardening"),	4038	flagpd1("mno-lvi-hardening"),
4038	flagpd1("mno-lwp"),	4039	m("mno-lwp"),
4039	flagpd1("mno-lzcnt"),	4040	m("mno-lzcnt"),
4040	flagpd1("mno-madd4"),	4041	flagpd1("mno-madd4"),
4041	flagpd1("mno-memops"),	4042	m("mno-memops"),
4042	flagpd1("mno-mfcrf"),	4043	flagpd1("mno-mfcrf"),
4043	flagpd1("mno-mfocrf"),	4044	m("mno-mfocrf"),
4044	flagpd1("mno-micromips"),	4045	m("mno-micromips"),
4045	flagpd1("mno-mips16"),	4046	m("mno-mips16"),
4046	flagpd1("mno-mma"),	4047	m("mno-mma"),
4047	flagpd1("mno-mmx"),	4048	m("mno-mmx"),
4048	flagpd1("mno-movbe"),	4049	m("mno-movbe"),
4049	flagpd1("mno-movdir64b"),	4050	m("mno-movdir64b"),
4050	flagpd1("mno-movdiri"),	4051	m("mno-movdiri"),
4051	flagpd1("mno-movt"),	4052	m("mno-movt"),
4052	flagpd1("mno-mpx"),	4053	flagpd1("mno-mpx"),
4053	flagpd1("mno-ms-bitfields"),	4054	flagpd1("mno-ms-bitfields"),
4054	flagpd1("mno-msa"),	4055	m("mno-msa"),
4055	flagpd1("mno-mt"),	4056	m("mno-mt"),
4056	flagpd1("mno-multivalue"),	4057	m("mno-multivalue"),
4057	flagpd1("mno-mutable-globals"),	4058	m("mno-mutable-globals"),
4058	flagpd1("mno-mwaitx"),	4059	m("mno-mwaitx"),
4059	flagpd1("mno-neg-immediates"),	4060	m("mno-neg-immediates"),
4060	flagpd1("mno-nontrapping-fptoint"),	4061	m("mno-nontrapping-fptoint"),
4061	flagpd1("mno-nvj"),	4062	m("mno-nvj"),
4062	flagpd1("mno-nvs"),	4063	m("mno-nvs"),
4063	flagpd1("mno-odd-spreg"),	4064	flagpd1("mno-odd-spreg"),
4064	flagpd1("mno-omit-leaf-frame-pointer"),	4065	flagpd1("mno-omit-leaf-frame-pointer"),
4065	flagpd1("mno-outline"),	4066	flagpd1("mno-outline"),
4066	flagpd1("mno-outline-atomics"),	4067	m("mno-outline-atomics"),
4067	flagpd1("mno-packed-stack"),	4068	flagpd1("mno-packed-stack"),
4068	flagpd1("mno-packets"),	4069	m("mno-packets"),
4069	flagpd1("mno-pascal-strings"),	4070	flagpd1("mno-pascal-strings"),
4070	flagpd1("mno-pclmul"),	4071	m("mno-pclmul"),
4071	flagpd1("mno-pconfig"),	4072	m("mno-pconfig"),
4072	flagpd1("mno-pcrel"),	4073	flagpd1("mno-pcrel"),
4073	flagpd1("mno-pku"),	4074	m("mno-pku"),
4074	flagpd1("mno-popcnt"),	4075	m("mno-popcnt"),
4075	flagpd1("mno-popcntd"),	4076	m("mno-popcntd"),
4076	flagpd1("mno-power10-vector"),	4077	m("mno-power10-vector"),
4077	flagpd1("mno-power8-vector"),	4078	m("mno-power8-vector"),
4078	flagpd1("mno-power9-vector"),	4079	m("mno-power9-vector"),
4079	flagpd1("mno-prefetchwt1"),	4080	m("mno-prefetchwt1"),
4080	flagpd1("mno-prefixed"),	4081	flagpd1("mno-prefixed"),
4081	flagpd1("mno-prfchw"),	4082	m("mno-prfchw"),
4082	flagpd1("mno-ptwrite"),	4083	m("mno-ptwrite"),
4083	flagpd1("mno-pure-code"),	4084	flagpd1("mno-pure-code"),
4084	flagpd1("mno-rdpid"),	4085	m("mno-rdpid"),
4085	flagpd1("mno-rdrnd"),	4086	m("mno-rdrnd"),
4086	flagpd1("mno-rdseed"),	4087	m("mno-rdseed"),
4087	.{	4088	.{
4088	.name = "mno-red-zone",	4089	.name = "mno-red-zone",
4089	.syntax = .flag,	4090	.syntax = .flag,
...	@@ -4092,73 +4093,73 @@ flagpd1("mno-rdseed"),	...	@@ -4092,73 +4093,73 @@ flagpd1("mno-rdseed"),
4092	.pd2 = false,	4093	.pd2 = false,
4093	.psl = false,	4094	.psl = false,
4094	},	4095	},
4095	flagpd1("mno-reference-types"),	4096	m("mno-reference-types"),
4096	flagpd1("mno-relax"),	4097	m("mno-relax"),
4097	flagpd1("mno-relax-all"),	4098	flagpd1("mno-relax-all"),
4098	flagpd1("mno-relax-pic-calls"),	4099	flagpd1("mno-relax-pic-calls"),
4099	flagpd1("mno-restrict-it"),	4100	flagpd1("mno-restrict-it"),
4100	flagpd1("mno-retpoline"),	4101	m("mno-retpoline"),
4101	flagpd1("mno-retpoline-external-thunk"),	4102	m("mno-retpoline-external-thunk"),
4102	flagpd1("mno-rtd"),	4103	flagpd1("mno-rtd"),
4103	flagpd1("mno-rtm"),	4104	m("mno-rtm"),
4104	flagpd1("mno-sahf"),	4105	m("mno-sahf"),
4105	flagpd1("mno-save-restore"),	4106	m("mno-save-restore"),
4106	flagpd1("mno-serialize"),	4107	m("mno-serialize"),
4107	flagpd1("mno-seses"),	4108	m("mno-seses"),
4108	flagpd1("mno-sgx"),	4109	m("mno-sgx"),
4109	flagpd1("mno-sha"),	4110	m("mno-sha"),
4110	flagpd1("mno-shstk"),	4111	m("mno-shstk"),
4111	flagpd1("mno-sign-ext"),	4112	m("mno-sign-ext"),
4112	flagpd1("mno-simd128"),	4113	m("mno-simd128"),
4113	flagpd1("mno-soft-float"),	4114	m("mno-soft-float"),
4114	flagpd1("mno-spe"),	4115	m("mno-spe"),
4115	flagpd1("mno-speculative-load-hardening"),	4116	flagpd1("mno-speculative-load-hardening"),
4116	flagpd1("mno-sse"),	4117	m("mno-sse"),
4117	flagpd1("mno-sse2"),	4118	m("mno-sse2"),
4118	flagpd1("mno-sse3"),	4119	m("mno-sse3"),
4119	flagpd1("mno-sse4"),	4120	flagpd1("mno-sse4"),
4120	flagpd1("mno-sse4.1"),	4121	m("mno-sse4.1"),
4121	flagpd1("mno-sse4.2"),	4122	m("mno-sse4.2"),
4122	flagpd1("mno-sse4a"),	4123	m("mno-sse4a"),
4123	flagpd1("mno-ssse3"),	4124	m("mno-ssse3"),
4124	flagpd1("mno-stack-arg-probe"),	4125	flagpd1("mno-stack-arg-probe"),
4125	flagpd1("mno-stackrealign"),	4126	flagpd1("mno-stackrealign"),
4126	flagpd1("mno-tail-call"),	4127	m("mno-tail-call"),
4127	flagpd1("mno-tbm"),	4128	m("mno-tbm"),
4128	flagpd1("mno-tgsplit"),	4129	m("mno-tgsplit"),
4129	flagpd1("mno-thumb"),	4130	flagpd1("mno-thumb"),
4130	flagpd1("mno-tls-direct-seg-refs"),	4131	flagpd1("mno-tls-direct-seg-refs"),
4131	flagpd1("mno-tsxldtrk"),	4132	m("mno-tsxldtrk"),
4132	flagpd1("mno-uintr"),	4133	m("mno-uintr"),
4133	flagpd1("mno-unaligned-access"),	4134	flagpd1("mno-unaligned-access"),
4134	flagpd1("mno-unsafe-fp-atomics"),	4135	flagpd1("mno-unsafe-fp-atomics"),
4135	flagpd1("mno-vaes"),	4136	m("mno-vaes"),
4136	flagpd1("mno-virt"),	4137	m("mno-virt"),
4137	flagpd1("mno-vpclmulqdq"),	4138	m("mno-vpclmulqdq"),
4138	flagpd1("mno-vsx"),	4139	m("mno-vsx"),
4139	flagpd1("mno-vx"),	4140	flagpd1("mno-vx"),
4140	flagpd1("mno-vzeroupper"),	4141	m("mno-vzeroupper"),
4141	flagpd1("mno-waitpkg"),	4142	m("mno-waitpkg"),
4142	flagpd1("mno-warn-nonportable-cfstrings"),	4143	flagpd1("mno-warn-nonportable-cfstrings"),
4143	flagpd1("mno-wavefrontsize64"),	4144	m("mno-wavefrontsize64"),
4144	flagpd1("mno-wbnoinvd"),	4145	m("mno-wbnoinvd"),
4145	flagpd1("mno-widekl"),	4146	m("mno-widekl"),
4146	flagpd1("mno-x87"),	4147	m("mno-x87"),
4147	flagpd1("mno-xgot"),	4148	m("mno-xgot"),
4148	flagpd1("mno-xop"),	4149	m("mno-xop"),
4149	flagpd1("mno-xsave"),	4150	m("mno-xsave"),
4150	flagpd1("mno-xsavec"),	4151	m("mno-xsavec"),
4151	flagpd1("mno-xsaveopt"),	4152	m("mno-xsaveopt"),
4152	flagpd1("mno-xsaves"),	4153	m("mno-xsaves"),
4153	flagpd1("mno-zvector"),	4154	flagpd1("mno-zvector"),
4154	flagpd1("mnocrc"),	4155	flagpd1("mnocrc"),
4155	flagpd1("mno-direct-move"),	4156	m("mno-direct-move"),
4156	flagpd1("mnontrapping-fptoint"),	4157	m("mnontrapping-fptoint"),
4157	flagpd1("mnop-mcount"),	4158	flagpd1("mnop-mcount"),
4158	flagpd1("mno-paired-vector-memops"),	4159	m("mno-paired-vector-memops"),
4159	flagpd1("mno-crypto"),	4160	m("mno-crypto"),
4160	flagpd1("mnvj"),	4161	m("mnvj"),
4161	flagpd1("mnvs"),	4162	m("mnvs"),
4162	flagpd1("modd-spreg"),	4163	flagpd1("modd-spreg"),
4163	sepd1("module-dependency-dir"),	4164	sepd1("module-dependency-dir"),
4164	sepd1("module-dir"),	4165	sepd1("module-dir"),
...	@@ -4167,31 +4168,31 @@ flagpd1("module-file-info"),	...	@@ -4167,31 +4168,31 @@ flagpd1("module-file-info"),
4167	sepd1("module-suffix"),	4168	sepd1("module-suffix"),
4168	flagpd1("momit-leaf-frame-pointer"),	4169	flagpd1("momit-leaf-frame-pointer"),
4169	flagpd1("moutline"),	4170	flagpd1("moutline"),
4170	flagpd1("moutline-atomics"),	4171	m("moutline-atomics"),
4171	flagpd1("mpacked-stack"),	4172	flagpd1("mpacked-stack"),
4172	flagpd1("mpackets"),	4173	m("mpackets"),
4173	flagpd1("mpaired-vector-memops"),	4174	m("mpaired-vector-memops"),
4174	flagpd1("mpascal-strings"),	4175	flagpd1("mpascal-strings"),
4175	flagpd1("mpclmul"),	4176	m("mpclmul"),
4176	flagpd1("mpconfig"),	4177	m("mpconfig"),
4177	flagpd1("mpcrel"),	4178	flagpd1("mpcrel"),
4178	flagpd1("mpku"),	4179	m("mpku"),
4179	flagpd1("mpopcnt"),	4180	m("mpopcnt"),
4180	flagpd1("mpopcntd"),	4181	m("mpopcntd"),
4181	flagpd1("mpower10-vector"),	4182	m("mpower10-vector"),
4182	flagpd1("mcrypto"),	4183	m("mcrypto"),
4183	flagpd1("mpower8-vector"),	4184	m("mpower8-vector"),
4184	flagpd1("mpower9-vector"),	4185	m("mpower9-vector"),
4185	flagpd1("mprefetchwt1"),	4186	m("mprefetchwt1"),
4186	flagpd1("mprefixed"),	4187	flagpd1("mprefixed"),
4187	flagpd1("mprfchw"),	4188	m("mprfchw"),
4188	flagpd1("mprivileged"),	4189	m("mprivileged"),
4189	flagpd1("mptwrite"),	4190	m("mptwrite"),
4190	flagpd1("mpure-code"),	4191	flagpd1("mpure-code"),
4191	flagpd1("mqdsp6-compat"),	4192	flagpd1("mqdsp6-compat"),
4192	flagpd1("mrdpid"),	4193	m("mrdpid"),
4193	flagpd1("mrdrnd"),	4194	m("mrdrnd"),
4194	flagpd1("mrdseed"),	4195	m("mrdseed"),
4195	flagpd1("mreassociate"),	4196	flagpd1("mreassociate"),
4196	flagpd1("mrecip"),	4197	flagpd1("mrecip"),
4197	flagpd1("mrecord-mcount"),	4198	flagpd1("mrecord-mcount"),
...	@@ -4203,9 +4204,9 @@ flagpd1("mrecord-mcount"),	...	@@ -4203,9 +4204,9 @@ flagpd1("mrecord-mcount"),
4203	.pd2 = false,	4204	.pd2 = false,
4204	.psl = false,	4205	.psl = false,
4205	},	4206	},
4206	flagpd1("mreference-types"),	4207	m("mreference-types"),
4207	sepd1("mregparm"),	4208	sepd1("mregparm"),
4208	flagpd1("mrelax"),	4209	m("mrelax"),
4209	flagpd1("mrelax-all"),	4210	flagpd1("mrelax-all"),
4210	flagpd1("mrelax-pic-calls"),	4211	flagpd1("mrelax-pic-calls"),
4211	.{	4212	.{
...	@@ -4218,86 +4219,86 @@ flagpd1("mrelax-pic-calls"),	...	@@ -4218,86 +4219,86 @@ flagpd1("mrelax-pic-calls"),
4218	},	4219	},
4219	sepd1("mrelocation-model"),	4220	sepd1("mrelocation-model"),
4220	flagpd1("mrestrict-it"),	4221	flagpd1("mrestrict-it"),
4221	flagpd1("mretpoline"),	4222	m("mretpoline"),
4222	flagpd1("mretpoline-external-thunk"),	4223	m("mretpoline-external-thunk"),
4223	flagpd1("mrop-protect"),	4224	m("mrop-protect"),
4224	flagpd1("mrtd"),	4225	flagpd1("mrtd"),
4225	flagpd1("mrtm"),	4226	m("mrtm"),
4226	flagpd1("msahf"),	4227	m("msahf"),
4227	flagpd1("msave-restore"),	4228	m("msave-restore"),
4228	flagpd1("msave-temp-labels"),	4229	flagpd1("msave-temp-labels"),
4229	flagpd1("msecure-plt"),	4230	m("msecure-plt"),
4230	flagpd1("mserialize"),	4231	m("mserialize"),
4231	flagpd1("msgx"),	4232	m("msgx"),
4232	flagpd1("msha"),	4233	m("msha"),
4233	flagpd1("mshstk"),	4234	m("mshstk"),
4234	flagpd1("msign-ext"),	4235	m("msign-ext"),
4235	flagpd1("msim"),	4236	flagpd1("msim"),
4236	flagpd1("msimd128"),	4237	m("msimd128"),
4237	flagpd1("msingle-float"),	4238	m("msingle-float"),
4238	sepd1("msmall-data-limit"),	4239	sepd1("msmall-data-limit"),
4239	flagpd1("msoft-float"),	4240	m("msoft-float"),
4240	flagpd1("mspe"),	4241	m("mspe"),
4241	flagpd1("mspeculative-load-hardening"),	4242	flagpd1("mspeculative-load-hardening"),
4242	flagpd1("msse"),	4243	m("msse"),
4243	flagpd1("msse2"),	4244	m("msse2"),
4244	flagpd1("msse3"),	4245	m("msse3"),
4245	flagpd1("msse4"),	4246	flagpd1("msse4"),
4246	flagpd1("msse4.1"),	4247	m("msse4.1"),
4247	flagpd1("msse4.2"),	4248	m("msse4.2"),
4248	flagpd1("msse4a"),	4249	m("msse4a"),
4249	flagpd1("mssse3"),	4250	m("mssse3"),
4250	flagpd1("mstack-arg-probe"),	4251	flagpd1("mstack-arg-probe"),
4251	flagpd1("mstackrealign"),	4252	flagpd1("mstackrealign"),
4252	flagpd1("mstrict-align"),	4253	m("mstrict-align"),
4253	flagpd1("msvr4-struct-return"),	4254	flagpd1("msvr4-struct-return"),
4254	sepd1("mt-migrate-directory"),	4255	sepd1("mt-migrate-directory"),
4255	flagpd1("mtail-call"),	4256	m("mtail-call"),
4256	flagpd1("mamx-int8"),	4257	m("mamx-int8"),
4257	flagpd1("mtbm"),	4258	m("mtbm"),
4258	flagpd1("mtgsplit"),	4259	m("mtgsplit"),
4259	sepd1("mthread-model"),	4260	sepd1("mthread-model"),
4260	flagpd1("mthumb"),	4261	flagpd1("mthumb"),
4261	flagpd1("mtls-direct-seg-refs"),	4262	flagpd1("mtls-direct-seg-refs"),
4262	sepd1("mtp"),	4263	sepd1("mtp"),
4263	flagpd1("mtsxldtrk"),	4264	m("mtsxldtrk"),
4264	flagpd1("mtune=?"),	4265	flagpd1("mtune=?"),
4265	flagpd1("muclibc"),	4266	flagpd1("muclibc"),
4266	flagpd1("muintr"),	4267	m("muintr"),
4267	flagpd1("multi_module"),	4268	flagpd1("multi_module"),
4268	sepd1("multiply_defined"),	4269	sepd1("multiply_defined"),
4269	sepd1("multiply_defined_unused"),	4270	sepd1("multiply_defined_unused"),
4270	flagpd1("munaligned-access"),	4271	flagpd1("munaligned-access"),
4271	flagpd1("munsafe-fp-atomics"),	4272	flagpd1("munsafe-fp-atomics"),
4272	flagpd1("munwind-tables"),	4273	flagpd1("munwind-tables"),
4273	flagpd1("mv5"),	4274	m("mv5"),
4274	flagpd1("mv55"),	4275	m("mv55"),
4275	flagpd1("mv60"),	4276	m("mv60"),
4276	flagpd1("mv62"),	4277	m("mv62"),
4277	flagpd1("mv65"),	4278	m("mv65"),
4278	flagpd1("mv66"),	4279	m("mv66"),
4279	flagpd1("mv67"),	4280	m("mv67"),
4280	flagpd1("mv67t"),	4281	flagpd1("mv67t"),
4281	flagpd1("mv68"),	4282	m("mv68"),
4282	flagpd1("mvaes"),	4283	m("mvaes"),
4283	flagpd1("mvirt"),	4284	m("mvirt"),
4284	flagpd1("mvpclmulqdq"),	4285	m("mvpclmulqdq"),
4285	flagpd1("mvsx"),	4286	m("mvsx"),
4286	flagpd1("mvx"),	4287	flagpd1("mvx"),
4287	flagpd1("mvzeroupper"),	4288	m("mvzeroupper"),
4288	flagpd1("mwaitpkg"),	4289	m("mwaitpkg"),
4289	flagpd1("mwarn-nonportable-cfstrings"),	4290	flagpd1("mwarn-nonportable-cfstrings"),
4290	flagpd1("mwavefrontsize64"),	4291	m("mwavefrontsize64"),
4291	flagpd1("mwbnoinvd"),	4292	m("mwbnoinvd"),
4292	flagpd1("mwidekl"),	4293	m("mwidekl"),
4293	flagpd1("mx32"),	4294	flagpd1("mx32"),
4294	flagpd1("mx87"),	4295	m("mx87"),
4295	flagpd1("mxgot"),	4296	m("mxgot"),
4296	flagpd1("mxop"),	4297	m("mxop"),
4297	flagpd1("mxsave"),	4298	m("mxsave"),
4298	flagpd1("mxsavec"),	4299	m("mxsavec"),
4299	flagpd1("mxsaveopt"),	4300	m("mxsaveopt"),
4300	flagpd1("mxsaves"),	4301	m("mxsaves"),
4301	flagpd1("mzvector"),	4302	flagpd1("mzvector"),
4302	flagpd1("n"),	4303	flagpd1("n"),
4303	flagpd1("new-struct-path-tbaa"),	4304	flagpd1("new-struct-path-tbaa"),

src/main.zig+67-4

...	@@ -665,6 +665,12 @@ fn buildOutputType(	...	@@ -665,6 +665,12 @@ fn buildOutputType(
665	var enable_link_snapshots: bool = false;	665	var enable_link_snapshots: bool = false;
666	var native_darwin_sdk: ?std.zig.system.darwin.DarwinSDK = null;	666	var native_darwin_sdk: ?std.zig.system.darwin.DarwinSDK = null;
667		667
		668	// e.g. -m3dnow or -mno-outline-atomics. They correspond to std.Target llvm cpu feature names.
		669	// This array is populated by zig cc frontend and then has to be converted to zig-style
		670	// CPU features.
		671	var llvm_m_args = std.ArrayList([]const u8).init(gpa);
		672	defer llvm_m_args.deinit();
		673
668	var system_libs = std.StringArrayHashMap(Compilation.SystemLib).init(gpa);	674	var system_libs = std.StringArrayHashMap(Compilation.SystemLib).init(gpa);
669	defer system_libs.deinit();	675	defer system_libs.deinit();
670		676
...	@@ -1412,7 +1418,9 @@ fn buildOutputType(	...	@@ -1412,7 +1418,9 @@ fn buildOutputType(
1412	.dry_run => {	1418	.dry_run => {
1413	verbose_link = true;	1419	verbose_link = true;
1414	try clang_argv.append("-###");	1420	try clang_argv.append("-###");
1415	// XXX: Don't execute anything!	1421	// This flag is supposed to mean "dry run" but currently this
		1422	// will actually still execute. The tracking issue for this is
		1423	// https://github.com/ziglang/zig/issues/7170
1416	},	1424	},
1417	.for_linker => try linker_args.append(it.only_arg),	1425	.for_linker => try linker_args.append(it.only_arg),
1418	.linker_input_z => {	1426	.linker_input_z => {
...	@@ -1421,6 +1429,7 @@ fn buildOutputType(	...	@@ -1421,6 +1429,7 @@ fn buildOutputType(
1421	},	1429	},
1422	.lib_dir => try lib_dirs.append(it.only_arg),	1430	.lib_dir => try lib_dirs.append(it.only_arg),
1423	.mcpu => target_mcpu = it.only_arg,	1431	.mcpu => target_mcpu = it.only_arg,
		1432	.m => try llvm_m_args.append(it.only_arg),
1424	.dep_file => {	1433	.dep_file => {
1425	disable_c_depfile = true;	1434	disable_c_depfile = true;
1426	try clang_argv.appendSlice(it.other_args);	1435	try clang_argv.appendSlice(it.other_args);
...	@@ -1798,12 +1807,62 @@ fn buildOutputType(	...	@@ -1798,12 +1807,62 @@ fn buildOutputType(
1798	}	1807	}
1799	};	1808	};
1800		1809
1801	const cross_target = try parseCrossTargetOrReportFatalError(arena, .{	1810	var target_parse_options: std.zig.CrossTarget.ParseOptions = .{
1802	.arch_os_abi = target_arch_os_abi,	1811	.arch_os_abi = target_arch_os_abi,
1803	.cpu_features = target_mcpu,	1812	.cpu_features = target_mcpu,
1804	.dynamic_linker = target_dynamic_linker,	1813	.dynamic_linker = target_dynamic_linker,
1805	});	1814	};
		1815
		1816	// Before passing the mcpu string in for parsing, we convert any -m flags that were
		1817	// passed in via zig cc to zig-style.
		1818	if (llvm_m_args.items.len != 0) {
		1819	// If this returns null, we let it fall through to the case below which will
		1820	// run the full parse function and do proper error handling.
		1821	if (std.zig.CrossTarget.parseCpuArch(target_parse_options)) \|cpu_arch\| {
		1822	var llvm_to_zig_name = std.StringHashMap([]const u8).init(gpa);
		1823	defer llvm_to_zig_name.deinit();
		1824
		1825	for (cpu_arch.allFeaturesList()) \|feature\| {
		1826	const llvm_name = feature.llvm_name orelse continue;
		1827	try llvm_to_zig_name.put(llvm_name, feature.name);
		1828	}
1806		1829
		1830	var mcpu_buffer = std.ArrayList(u8).init(gpa);
		1831	defer mcpu_buffer.deinit();
		1832
		1833	try mcpu_buffer.appendSlice(target_mcpu orelse "baseline");
		1834
		1835	for (llvm_m_args.items) \|llvm_m_arg\| {
		1836	if (mem.startsWith(u8, llvm_m_arg, "mno-")) {
		1837	const llvm_name = llvm_m_arg["mno-".len..];
		1838	const zig_name = llvm_to_zig_name.get(llvm_name) orelse {
		1839	fatal("target architecture {s} has no LLVM CPU feature named '{s}'", .{
		1840	@tagName(cpu_arch), llvm_name,
		1841	});
		1842	};
		1843	try mcpu_buffer.append('-');
		1844	try mcpu_buffer.appendSlice(zig_name);
		1845	} else if (mem.startsWith(u8, llvm_m_arg, "m")) {
		1846	const llvm_name = llvm_m_arg["m".len..];
		1847	const zig_name = llvm_to_zig_name.get(llvm_name) orelse {
		1848	fatal("target architecture {s} has no LLVM CPU feature named '{s}'", .{
		1849	@tagName(cpu_arch), llvm_name,
		1850	});
		1851	};
		1852	try mcpu_buffer.append('+');
		1853	try mcpu_buffer.appendSlice(zig_name);
		1854	} else {
		1855	unreachable;
		1856	}
		1857	}
		1858
		1859	const adjusted_target_mcpu = try arena.dupe(u8, mcpu_buffer.items);
		1860	std.log.debug("adjusted target_mcpu: {s}", .{adjusted_target_mcpu});
		1861	target_parse_options.cpu_features = adjusted_target_mcpu;
		1862	}
		1863	}
		1864
		1865	const cross_target = try parseCrossTargetOrReportFatalError(arena, target_parse_options);
1807	const target_info = try detectNativeTargetInfo(gpa, cross_target);	1866	const target_info = try detectNativeTargetInfo(gpa, cross_target);
1808		1867
1809	if (target_info.target.os.tag != .freestanding) {	1868	if (target_info.target.os.tag != .freestanding) {
...	@@ -2580,7 +2639,10 @@ fn buildOutputType(	...	@@ -2580,7 +2639,10 @@ fn buildOutputType(
2580	return cleanExit();	2639	return cleanExit();
2581	}	2640	}
2582		2641
2583	fn parseCrossTargetOrReportFatalError(allocator: *Allocator, opts: std.zig.CrossTarget.ParseOptions) !std.zig.CrossTarget {	2642	fn parseCrossTargetOrReportFatalError(
		2643	allocator: *Allocator,
		2644	opts: std.zig.CrossTarget.ParseOptions,
		2645	) !std.zig.CrossTarget {
2584	var opts_with_diags = opts;	2646	var opts_with_diags = opts;
2585	var diags: std.zig.CrossTarget.ParseOptions.Diagnostics = .{};	2647	var diags: std.zig.CrossTarget.ParseOptions.Diagnostics = .{};
2586	if (opts_with_diags.diagnostics == null) {	2648	if (opts_with_diags.diagnostics == null) {
...	@@ -3948,6 +4010,7 @@ pub const ClangArgIterator = struct {	...	@@ -3948,6 +4010,7 @@ pub const ClangArgIterator = struct {
3948	target,	4010	target,
3949	o,	4011	o,
3950	c,	4012	c,
		4013	m,
3951	other,	4014	other,
3952	positional,	4015	positional,
3953	l,	4016	l,

tools/update_clang_options.zig+52-8

 @@ -426,11 +426,32 @@ fn knownOption(name: []const u8) ?[]const u8 {
     return null;
 }
+const cpu_targets = struct {
+    pub const aarch64 = std.Target.aarch64;
+    pub const arc = std.Target.arc;
+    pub const amdgpu = std.Target.amdgpu;
+    pub const arm = std.Target.arm;
+    pub const avr = std.Target.avr;
+    pub const bpf = std.Target.bpf;
+    pub const hexagon = std.Target.hexagon;
+    pub const mips = std.Target.mips;
+    pub const msp430 = std.Target.msp430;
+    pub const nvptx = std.Target.nvptx;
+    pub const powerpc = std.Target.powerpc;
+    pub const riscv = std.Target.riscv;
+    pub const sparc = std.Target.sparc;
+    pub const spirv = std.Target.spirv;
+    pub const systemz = std.Target.systemz;
+    pub const ve = std.Target.ve;
+    pub const wasm = std.Target.wasm;
+    pub const x86 = std.Target.x86;
+};
 pub fn main() anyerror!void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
     const allocator = &arena.allocator;
     const args = try std.process.argsAlloc(allocator);
     if (args.len <= 1) {
 @@ -453,6 +474,20 @@ pub fn main() anyerror!void {
         usageAndExit(std.io.getStdErr(), args[0], 1);
     }
+    var llvm_to_zig_cpu_features = std.StringHashMap([]const u8).init(allocator);
+    inline for (@typeInfo(cpu_targets).Struct.decls) |decl| {
+        const Feature = @field(cpu_targets, decl.name).Feature;
+        const all_features = @field(cpu_targets, decl.name).all_features;
+        for (all_features) |feat, i| {
+            const llvm_name = feat.llvm_name orelse continue;
+            const zig_feat = @intToEnum(Feature, i);
+            const zig_name = @tagName(zig_feat);
+            try llvm_to_zig_cpu_features.put(llvm_name, zig_name);
+        }
+    }
     const child_args = [_][]const u8{
         llvm_tblgen_exe,
         "--dump-json",
 @@ -467,15 +502,15 @@ pub fn main() anyerror!void {
         .max_output_bytes = 100 * 1024 * 1024,
     });
-    std.debug.warn("{s}\n", .{child_result.stderr});
+    std.debug.print("{s}\n", .{child_result.stderr});
     const json_text = switch (child_result.term) {
         .Exited => |code| if (code == 0) child_result.stdout else {
-            std.debug.warn("llvm-tblgen exited with code {d}\n", .{code});
+            std.debug.print("llvm-tblgen exited with code {d}\n", .{code});
             std.process.exit(1);
         },
         else => {
-            std.debug.warn("llvm-tblgen crashed\n", .{});
+            std.debug.print("llvm-tblgen crashed\n", .{});
             std.process.exit(1);
         },
     };
 @@ -516,6 +551,7 @@ pub fn main() anyerror!void {
         \\const joinpd1 = clang_options.joinpd1;
         \\const jspd1 = clang_options.jspd1;
         \\const sepd1 = clang_options.sepd1;
+        \\const m = clang_options.m;
         \\pub const data = blk: { @setEvalBranchQuota(6000); break :blk &[_]CliArg{
         \\
     );
 @@ -534,7 +570,7 @@ pub fn main() anyerror!void {
             } else if (std.mem.eql(u8, prefix, "/")) {
                 pslash = true;
             } else {
-                std.debug.warn("{s} has unrecognized prefix '{s}'\n", .{ name, prefix });
+                std.debug.print("{s} has unrecognized prefix '{s}'\n", .{ name, prefix });
                 std.process.exit(1);
             }
         }
 @@ -562,7 +598,15 @@ pub fn main() anyerror!void {
                 \\
             , .{ name, final_syntax, ident, pd1, pd2, pslash });
         } else if (pd1 and !pd2 and !pslash and syntax == .flag) {
-            try stdout.print("flagpd1(\"{s}\"),\n", .{name});
+            if ((std.mem.startsWith(u8, name, "mno-") and
+                llvm_to_zig_cpu_features.contains(name["mno-".len..])) or
+                (std.mem.startsWith(u8, name, "m") and
+                llvm_to_zig_cpu_features.contains(name["m".len..])))
+            {
+                try stdout.print("m(\"{s}\"),\n", .{name});
+            } else {
+                try stdout.print("flagpd1(\"{s}\"),\n", .{name});
+            }
         } else if (!pd1 and !pd2 and pslash and syntax == .flag) {
             try stdout.print("flagpsl(\"{s}\"),\n", .{name});
         } else if (pd1 and !pd2 and !pslash and syntax == .joined) {
 @@ -683,9 +727,9 @@ fn objSyntax(obj: *json.ObjectMap) Syntax {
         return .flag;
     }
     const key = obj.get("!name").?.String;
-    std.debug.warn("{s} (key {s}) has unrecognized superclasses:\n", .{ name, key });
+    std.debug.print("{s} (key {s}) has unrecognized superclasses:\n", .{ name, key });
     for (obj.get("!superclasses").?.Array.items) |superclass_json| {
-        std.debug.warn(" {s}\n", .{superclass_json.String});
+        std.debug.print(" {s}\n", .{superclass_json.String});
     }
     std.process.exit(1);
 }