authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2020-03-21 16:38:58-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-21 16:53:59-04:00
log28ad78cb7f4a567ce6a595b8ff466e90b311f3e4
treeb09e3a4728bcff2338d18b6fcd5f373c7e6cecee
parent4d9b458f8f722603dd0c303bddeca553948025fb
signature Commit is signed but in an unrecognized format.

rename "passthrough" → "driver_punt"

- 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,7 +4,14 @@ usingnamespace @import("clang_options.zig");
4pub const data = blk: { @setEvalBranchQuota(6000); break :blk &[_]CliArg{4pub const data = blk: { @setEvalBranchQuota(6000); break :blk &[_]CliArg{
5flagpd1("C"),5flagpd1("C"),
6flagpd1("CC"),6flagpd1("CC"),
7flagpd1("E"),7.{
8 .name = "E",
9 .syntax = .flag,
10 .zig_equivalent = .driver_punt,
11 .pd1 = true,
12 .pd2 = false,
13 .psl = false,
14},
8flagpd1("EB"),15flagpd1("EB"),
9flagpd1("EL"),16flagpd1("EL"),
10flagpd1("Eonly"),17flagpd1("Eonly"),
...@@ -36,7 +43,14 @@ flagpd1("Q"),...@@ -36,7 +43,14 @@ flagpd1("Q"),
36flagpd1("Qn"),43flagpd1("Qn"),
37flagpd1("Qunused-arguments"),44flagpd1("Qunused-arguments"),
38flagpd1("Qy"),45flagpd1("Qy"),
39flagpd1("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 .name = "<unknown>",55 .name = "<unknown>",
42 .syntax = .flag,56 .syntax = .flag,
...@@ -119,7 +133,7 @@ flagpd1("###"),...@@ -119,7 +133,7 @@ flagpd1("###"),
119.{133.{
120 .name = "E",134 .name = "E",
121 .syntax = .flag,135 .syntax = .flag,
122 .zig_equivalent = .other,136 .zig_equivalent = .driver_punt,
123 .pd1 = true,137 .pd1 = true,
124 .pd2 = false,138 .pd2 = false,
125 .psl = true,139 .psl = true,
...@@ -1127,7 +1141,7 @@ flagpd1("###"),...@@ -1127,7 +1141,7 @@ flagpd1("###"),
1127.{1141.{
1128 .name = "help",1142 .name = "help",
1129 .syntax = .flag,1143 .syntax = .flag,
1130 .zig_equivalent = .passthrough,1144 .zig_equivalent = .driver_punt,
1131 .pd1 = true,1145 .pd1 = true,
1132 .pd2 = false,1146 .pd2 = false,
1133 .psl = true,1147 .psl = true,
...@@ -3131,7 +3145,7 @@ sepd1("header-include-file"),...@@ -3131,7 +3145,7 @@ sepd1("header-include-file"),
3131.{3145.{
3132 .name = "help",3146 .name = "help",
3133 .syntax = .flag,3147 .syntax = .flag,
3134 .zig_equivalent = .passthrough,3148 .zig_equivalent = .driver_punt,
3135 .pd1 = true,3149 .pd1 = true,
3136 .pd2 = true,3150 .pd2 = true,
3137 .psl = false,3151 .psl = false,
src-self-hosted/stage2.zig+1-1
...@@ -1240,7 +1240,7 @@ pub const ClangArgIterator = extern struct {...@@ -1240,7 +1240,7 @@ pub const ClangArgIterator = extern struct {
1240 positional,1240 positional,
1241 l,1241 l,
1242 ignore,1242 ignore,
1243 passthrough,1243 driver_punt,
1244 pic,1244 pic,
1245 no_pic,1245 no_pic,
1246 nostdlib,1246 nostdlib,
src/main.cpp+1-1
...@@ -630,7 +630,7 @@ static int main0(int argc, char **argv) {...@@ -630,7 +630,7 @@ static int main0(int argc, char **argv) {
630 break;630 break;
631 case Stage2ClangArgIgnore:631 case Stage2ClangArgIgnore:
632 break;632 break;
633 case Stage2ClangArgPassthrough:633 case Stage2ClangArgDriverPunt:
634 // Never mind what we're doing, just pass the args directly. For example --help.634 // Never mind what we're doing, just pass the args directly. For example --help.
635 return ZigClang_main(argc, argv);635 return ZigClang_main(argc, argv);
636 case Stage2ClangArgPIC:636 case Stage2ClangArgPIC:
src/stage2.h+1-1
...@@ -326,7 +326,7 @@ enum Stage2ClangArg {...@@ -326,7 +326,7 @@ enum Stage2ClangArg {
326 Stage2ClangArgPositional,326 Stage2ClangArgPositional,
327 Stage2ClangArgL,327 Stage2ClangArgL,
328 Stage2ClangArgIgnore,328 Stage2ClangArgIgnore,
329 Stage2ClangArgPassthrough,329 Stage2ClangArgDriverPunt,
330 Stage2ClangArgPIC,330 Stage2ClangArgPIC,
331 Stage2ClangArgNoPIC,331 Stage2ClangArgNoPIC,
332 Stage2ClangArgNoStdLib,332 Stage2ClangArgNoStdLib,
tools/update_clang_options.zig+9-1
...@@ -44,7 +44,7 @@ const known_options = [_]KnownOpt{...@@ -44,7 +44,7 @@ const known_options = [_]KnownOpt{
44 },44 },
45 .{45 .{
46 .name = "help",46 .name = "help",
47 .ident = "passthrough",47 .ident = "driver_punt",
48 },48 },
49 .{49 .{
50 .name = "fPIC",50 .name = "fPIC",
...@@ -74,6 +74,14 @@ const known_options = [_]KnownOpt{...@@ -74,6 +74,14 @@ const known_options = [_]KnownOpt{
74 .name = "Wl,",74 .name = "Wl,",
75 .ident = "wl",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};
7886
79const blacklisted_options = [_][]const u8{};87const blacklisted_options = [_][]const u8{};