Commit c22a30ac99b9a2b92d9a8e926b9bf0c9dbc3d14e | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-04-07 15:13:33-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-04-08 15:48:27-04:00
log	c22a30ac99b9a2b92d9a8e926b9bf0c9dbc3d14e
tree	7fd19495c2ba91cc768b4a3aca8c9ff625b40a7d
parent	aa45854ec3d94c1b95fb1a5d8e5482a80561b068

zig cc: handle the -r flag

This makes -r treated the same as -c which is to output an object file.
Zig's ELF linker code already handles multiple object files into an
object file with the -r flag to LLD.

closes #11683

3 files changed, 32 insertions(+), 19 deletions(-)

src
- clang_options_data.zig
- main.zig
tools
- update_clang_options.zig

src/clang_options_data.zig+26-18

...	@@ -4002,7 +4002,7 @@ flagpd1("malign-double"),	...	@@ -4002,7 +4002,7 @@ flagpd1("malign-double"),
4002	m("maltivec"),	4002	m("maltivec"),
4003	flagpd1("mamdgpu-ieee"),	4003	flagpd1("mamdgpu-ieee"),
4004	m("mamx-bf16"),	4004	m("mamx-bf16"),
4005	flagpd1("mamx-fp16"),	4005	m("mamx-fp16"),
4006	m("mamx-int8"),	4006	m("mamx-int8"),
4007	m("mamx-tile"),	4007	m("mamx-tile"),
4008	flagpd1("marm"),	4008	flagpd1("marm"),
...	@@ -4027,10 +4027,10 @@ m("mavx512vl"),	...	@@ -4027,10 +4027,10 @@ m("mavx512vl"),
4027	m("mavx512vnni"),	4027	m("mavx512vnni"),
4028	m("mavx512vp2intersect"),	4028	m("mavx512vp2intersect"),
4029	m("mavx512vpopcntdq"),	4029	m("mavx512vpopcntdq"),
4030	flagpd1("mavxifma"),	4030	m("mavxifma"),
4031	flagpd1("mavxneconvert"),	4031	m("mavxneconvert"),
4032	m("mavxvnni"),	4032	m("mavxvnni"),
4033	flagpd1("mavxvnniint8"),	4033	m("mavxvnniint8"),
4034	flagpd1("mbackchain"),	4034	flagpd1("mbackchain"),
4035	flagpd1("mbig-endian"),	4035	flagpd1("mbig-endian"),
4036	m("mbmi"),	4036	m("mbmi"),
...	@@ -4039,6 +4039,7 @@ flagpd1("mbranch-likely"),	...	@@ -4039,6 +4039,7 @@ flagpd1("mbranch-likely"),
4039	flagpd1("mbranch-target-enforce"),	4039	flagpd1("mbranch-target-enforce"),
4040	flagpd1("mbranches-within-32B-boundaries"),	4040	flagpd1("mbranches-within-32B-boundaries"),
4041	m("mbulk-memory"),	4041	m("mbulk-memory"),
		4042	m("mcabac"),
4042	flagpd1("mcheck-zero-division"),	4043	flagpd1("mcheck-zero-division"),
4043	m("mcldemote"),	4044	m("mcldemote"),
4044	m("mclflushopt"),	4045	m("mclflushopt"),
...	@@ -4047,7 +4048,7 @@ m("mclzero"),	...	@@ -4047,7 +4048,7 @@ m("mclzero"),
4047	flagpd1("mcmodel=medany"),	4048	flagpd1("mcmodel=medany"),
4048	flagpd1("mcmodel=medlow"),	4049	flagpd1("mcmodel=medlow"),
4049	m("mcmpb"),	4050	m("mcmpb"),
4050	flagpd1("mcmpccxadd"),	4051	m("mcmpccxadd"),
4051	flagpd1("mcmse"),	4052	flagpd1("mcmse"),
4052	flagpd1("mcode-object-v3"),	4053	flagpd1("mcode-object-v3"),
4053	flagpd1("mconstant-cfstrings"),	4054	flagpd1("mconstant-cfstrings"),
...	@@ -4185,7 +4186,7 @@ m("mno-aes"),	...	@@ -4185,7 +4186,7 @@ m("mno-aes"),
4185	m("mno-altivec"),	4186	m("mno-altivec"),
4186	flagpd1("mno-amdgpu-ieee"),	4187	flagpd1("mno-amdgpu-ieee"),
4187	m("mno-amx-bf16"),	4188	m("mno-amx-bf16"),
4188	flagpd1("mno-amx-fp16"),	4189	m("mno-amx-fp16"),
4189	m("mno-amx-int8"),	4190	m("mno-amx-int8"),
4190	m("mno-amx-tile"),	4191	m("mno-amx-tile"),
4191	m("mno-atomics"),	4192	m("mno-atomics"),
...	@@ -4207,10 +4208,10 @@ m("mno-avx512vl"),	...	@@ -4207,10 +4208,10 @@ m("mno-avx512vl"),
4207	m("mno-avx512vnni"),	4208	m("mno-avx512vnni"),
4208	m("mno-avx512vp2intersect"),	4209	m("mno-avx512vp2intersect"),
4209	m("mno-avx512vpopcntdq"),	4210	m("mno-avx512vpopcntdq"),
4210	flagpd1("mno-avxifma"),	4211	m("mno-avxifma"),
4211	flagpd1("mno-avxneconvert"),	4212	m("mno-avxneconvert"),
4212	m("mno-avxvnni"),	4213	m("mno-avxvnni"),
4213	flagpd1("mno-avxvnniint8"),	4214	m("mno-avxvnniint8"),
4214	flagpd1("mno-backchain"),	4215	flagpd1("mno-backchain"),
4215	m("mno-bmi"),	4216	m("mno-bmi"),
4216	m("mno-bmi2"),	4217	m("mno-bmi2"),
...	@@ -4223,7 +4224,7 @@ m("mno-clflushopt"),	...	@@ -4223,7 +4224,7 @@ m("mno-clflushopt"),
4223	m("mno-clwb"),	4224	m("mno-clwb"),
4224	m("mno-clzero"),	4225	m("mno-clzero"),
4225	m("mno-cmpb"),	4226	m("mno-cmpb"),
4226	flagpd1("mno-cmpccxadd"),	4227	m("mno-cmpccxadd"),
4227	flagpd1("mno-code-object-v3"),	4228	flagpd1("mno-code-object-v3"),
4228	flagpd1("mno-constant-cfstrings"),	4229	flagpd1("mno-constant-cfstrings"),
4229	flagpd1("mno-constructor-aliases"),	4230	flagpd1("mno-constructor-aliases"),
...	@@ -4249,7 +4250,7 @@ flagpd1("mno-fix-cortex-a72-aes-1655431"),	...	@@ -4249,7 +4250,7 @@ flagpd1("mno-fix-cortex-a72-aes-1655431"),
4249	m("mno-float128"),	4250	m("mno-float128"),
4250	m("mno-fma"),	4251	m("mno-fma"),
4251	m("mno-fma4"),	4252	m("mno-fma4"),
4252	flagpd1("mno-fmv"),	4253	m("mno-fmv"),
4253	flagpd1("mno-fp-ret-in-387"),	4254	flagpd1("mno-fp-ret-in-387"),
4254	m("mno-fprnd"),	4255	m("mno-fprnd"),
4255	m("mno-fpu"),	4256	m("mno-fpu"),
...	@@ -4322,13 +4323,13 @@ m("mno-popcntd"),	...	@@ -4322,13 +4323,13 @@ m("mno-popcntd"),
4322	m("mno-power10-vector"),	4323	m("mno-power10-vector"),
4323	m("mno-power8-vector"),	4324	m("mno-power8-vector"),
4324	m("mno-power9-vector"),	4325	m("mno-power9-vector"),
4325	flagpd1("mno-prefetchi"),	4326	m("mno-prefetchi"),
4326	m("mno-prefetchwt1"),	4327	m("mno-prefetchwt1"),
4327	flagpd1("mno-prefixed"),	4328	flagpd1("mno-prefixed"),
4328	m("mno-prfchw"),	4329	m("mno-prfchw"),
4329	m("mno-ptwrite"),	4330	m("mno-ptwrite"),
4330	flagpd1("mno-pure-code"),	4331	flagpd1("mno-pure-code"),
4331	flagpd1("mno-raoint"),	4332	m("mno-raoint"),
4332	m("mno-rdpid"),	4333	m("mno-rdpid"),
4333	m("mno-rdpru"),	4334	m("mno-rdpru"),
4334	m("mno-rdrnd"),	4335	m("mno-rdrnd"),
...	@@ -4438,7 +4439,7 @@ m("mpower10-vector"),	...	@@ -4438,7 +4439,7 @@ m("mpower10-vector"),
4438	m("mcrypto"),	4439	m("mcrypto"),
4439	m("mpower8-vector"),	4440	m("mpower8-vector"),
4440	m("mpower9-vector"),	4441	m("mpower9-vector"),
4441	flagpd1("mprefetchi"),	4442	m("mprefetchi"),
4442	m("mprefetchwt1"),	4443	m("mprefetchwt1"),
4443	flagpd1("mprefixed"),	4444	flagpd1("mprefixed"),
4444	m("mprfchw"),	4445	m("mprfchw"),
...	@@ -4446,7 +4447,7 @@ m("mprivileged"),	...	@@ -4446,7 +4447,7 @@ m("mprivileged"),
4446	m("mptwrite"),	4447	m("mptwrite"),
4447	flagpd1("mpure-code"),	4448	flagpd1("mpure-code"),
4448	flagpd1("mqdsp6-compat"),	4449	flagpd1("mqdsp6-compat"),
4449	flagpd1("mraoint"),	4450	m("mraoint"),
4450	m("mrdpid"),	4451	m("mrdpid"),
4451	m("mrdpru"),	4452	m("mrdpru"),
4452	m("mrdrnd"),	4453	m("mrdrnd"),
...	@@ -4533,9 +4534,9 @@ m("mv67"),	...	@@ -4533,9 +4534,9 @@ m("mv67"),
4533	flagpd1("mv67t"),	4534	flagpd1("mv67t"),
4534	m("mv68"),	4535	m("mv68"),
4535	m("mv69"),	4536	m("mv69"),
4536	flagpd1("mv71"),	4537	m("mv71"),
4537	flagpd1("mv71t"),	4538	flagpd1("mv71t"),
4538	flagpd1("mv73"),	4539	m("mv73"),
4539	m("mvaes"),	4540	m("mvaes"),
4540	m("mvirt"),	4541	m("mvirt"),
4541	m("mvis"),	4542	m("mvis"),
...	@@ -4950,7 +4951,14 @@ flagpd1("print-stats"),	...	@@ -4950,7 +4951,14 @@ flagpd1("print-stats"),
4950	flagpd1("private_bundle"),	4951	flagpd1("private_bundle"),
4951	flagpd1("pthread"),	4952	flagpd1("pthread"),
4952	flagpd1("pthreads"),	4953	flagpd1("pthreads"),
4953	flagpd1("r"),	4954	.{
		4955	.name = "r",
		4956	.syntax = .flag,
		4957	.zig_equivalent = .r,
		4958	.pd1 = true,
		4959	.pd2 = false,
		4960	.psl = false,
		4961	},
4954	.{	4962	.{
4955	.name = "rdynamic",	4963	.name = "rdynamic",
4956	.syntax = .flag,	4964	.syntax = .flag,

src/main.zig+2-1

...	@@ -1569,7 +1569,7 @@ fn buildOutputType(	...	@@ -1569,7 +1569,7 @@ fn buildOutputType(
1569	out_path = it.only_arg;	1569	out_path = it.only_arg;
1570	}	1570	}
1571	},	1571	},
1572	.c => c_out_mode = .object, // -c	1572	.c, .r => c_out_mode = .object, // -c or -r
1573	.asm_only => c_out_mode = .assembly, // -S	1573	.asm_only => c_out_mode = .assembly, // -S
1574	.preprocess_only => c_out_mode = .preprocessor, // -E	1574	.preprocess_only => c_out_mode = .preprocessor, // -E
1575	.emit_llvm => emit_llvm = true,	1575	.emit_llvm => emit_llvm = true,
...	@@ -5134,6 +5134,7 @@ pub const ClangArgIterator = struct {	...	@@ -5134,6 +5134,7 @@ pub const ClangArgIterator = struct {
5134	target,	5134	target,
5135	o,	5135	o,
5136	c,	5136	c,
		5137	r,
5137	m,	5138	m,
5138	x,	5139	x,
5139	other,	5140	other,

tools/update_clang_options.zig+4

 @@ -34,6 +34,10 @@ const known_options = [_]KnownOpt{
         .name = "c",
         .ident = "c",
     },
+    .{
+        .name = "r",
+        .ident = "r",
+    },
     .{
         .name = "l",
         .ident = "l",