Commit 28ad78cb7f4a567ce6a595b8ff466e90b311f3e4 | zig

author	Michael Dusan <michael.dusan@gmail.com> 2020-03-21 16:38:58-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-03-21 16:53:59-04:00
log	28ad78cb7f4a567ce6a595b8ff466e90b311f3e4
tree	b09e3a4728bcff2338d18b6fcd5f373c7e6cecee
parent	4d9b458f8f722603dd0c303bddeca553948025fb
signature	Commit is signed but in an unrecognized format.

- punt when `-E` is supplied
- punt when `-S` is supplied

5 files changed, 31 insertions(+), 9 deletions(-)

src-self-hosted/clang_options_data.zig+19-5

...	...	@@ -4,7 +4,14 @@ usingnamespace @import("clang_options.zig");
4	4	pub const data = blk: { @setEvalBranchQuota(6000); break :blk &[_]CliArg{
5	5	flagpd1("C"),
6	6	flagpd1("CC"),
7		flagpd1("E"),
	7	.{
	8	.name = "E",
	9	.syntax = .flag,
	10	.zig_equivalent = .driver_punt,
	11	.pd1 = true,
	12	.pd2 = false,
	13	.psl = false,
	14	},
8	15	flagpd1("EB"),
9	16	flagpd1("EL"),
10	17	flagpd1("Eonly"),
...	...	@@ -36,7 +43,14 @@ flagpd1("Q"),
36	43	flagpd1("Qn"),
37	44	flagpd1("Qunused-arguments"),
38	45	flagpd1("Qy"),
39		flagpd1("S"),
	46	.{
	47	.name = "S",
	48	.syntax = .flag,
	49	.zig_equivalent = .driver_punt,
	50	.pd1 = true,
	51	.pd2 = false,
	52	.psl = false,
	53	},
40	54	.{
41	55	.name = "<unknown>",
42	56	.syntax = .flag,
...	...	@@ -119,7 +133,7 @@ flagpd1("###"),
119	133	.{
120	134	.name = "E",
121	135	.syntax = .flag,
122		.zig_equivalent = .other,
	136	.zig_equivalent = .driver_punt,
123	137	.pd1 = true,
124	138	.pd2 = false,
125	139	.psl = true,
...	...	@@ -1127,7 +1141,7 @@ flagpd1("###"),
1127	1141	.{
1128	1142	.name = "help",
1129	1143	.syntax = .flag,
1130		.zig_equivalent = .passthrough,
	1144	.zig_equivalent = .driver_punt,
1131	1145	.pd1 = true,
1132	1146	.pd2 = false,
1133	1147	.psl = true,
...	...	@@ -3131,7 +3145,7 @@ sepd1("header-include-file"),
3131	3145	.{
3132	3146	.name = "help",
3133	3147	.syntax = .flag,
3134		.zig_equivalent = .passthrough,
	3148	.zig_equivalent = .driver_punt,
3135	3149	.pd1 = true,
3136	3150	.pd2 = true,
3137	3151	.psl = false,

src-self-hosted/stage2.zig+1-1

...	...	@@ -1240,7 +1240,7 @@ pub const ClangArgIterator = extern struct {
1240	1240	positional,
1241	1241	l,
1242	1242	ignore,
1243		passthrough,
	1243	driver_punt,
1244	1244	pic,
1245	1245	no_pic,
1246	1246	nostdlib,

src/main.cpp+1-1

...	...	@@ -630,7 +630,7 @@ static int main0(int argc, char **argv) {
630	630	break;
631	631	case Stage2ClangArgIgnore:
632	632	break;
633		case Stage2ClangArgPassthrough:
	633	case Stage2ClangArgDriverPunt:
634	634	// Never mind what we're doing, just pass the args directly. For example --help.
635	635	return ZigClang_main(argc, argv);
636	636	case Stage2ClangArgPIC:

src/stage2.h+1-1

tools/update_clang_options.zig+9-1

...	...	@@ -44,7 +44,7 @@ const known_options = [_]KnownOpt{
44	44	},
45	45	.{
46	46	.name = "help",
47		.ident = "passthrough",
	47	.ident = "driver_punt",
48	48	},
49	49	.{
50	50	.name = "fPIC",
...	...	@@ -74,6 +74,14 @@ const known_options = [_]KnownOpt{
74	74	.name = "Wl,",
75	75	.ident = "wl",
76	76	},
	77	.{
	78	.name = "E",
	79	.ident = "driver_punt",
	80	},
	81	.{
	82	.name = "S",
	83	.ident = "driver_punt",
	84	},
77	85	};
78	86
79	87	const blacklisted_options = [_][]const u8{};