Commit 2b6dfdd3d403fb33e226aa2566eacfad4b251379 | zig

author	Rejean Loyer <rejean.loyer@gmail.com> 2020-04-01 05:22:19-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-04-01 17:21:11-04:00
log	2b6dfdd3d403fb33e226aa2566eacfad4b251379
tree	f6514ccd5329bf22df3b1f17a17ecc7f85320b69
parent	783f73c7e3590f05825d66f1f0ccb108be74b5c4

5 files changed, 23 insertions(+), 3 deletions(-)

src-self-hosted/clang_options_data.zig+10-3

 @@ -1658,7 +1658,7 @@ sepd1("Zlinker-input"),
 .{
     .name = "library-directory",
     .syntax = .separate,
-    .zig_equivalent = .other,
+    .zig_equivalent = .linker_input_l,
     .pd1 = false,
     .pd2 = true,
     .psl = false,
 @@ -4534,7 +4534,7 @@ joinpd1("target-sdk-version="),
 .{
     .name = "library-directory=",
     .syntax = .joined,
-    .zig_equivalent = .other,
+    .zig_equivalent = .linker_input_l,
     .pd1 = false,
     .pd2 = true,
     .psl = false,
 @@ -5632,7 +5632,14 @@ jspd1("F"),
 jspd1("G"),
 jspd1("I"),
 jspd1("J"),
-jspd1("L"),
+.{
+    .name = "L",
+    .syntax = .joined_or_separate,
+    .zig_equivalent = .linker_input_l,
+    .pd1 = true,
+    .pd2 = false,
+    .psl = false,
+},
 .{
     .name = "O",
     .syntax = .joined,

src-self-hosted/stage2.zig+1

...	@@ -1288,6 +1288,7 @@ pub const ClangArgIterator = extern struct {	...	@@ -1288,6 +1288,7 @@ pub const ClangArgIterator = extern struct {
1288	verbose_cmds,	1288	verbose_cmds,
1289	for_linker,	1289	for_linker,
1290	linker_input_z,	1290	linker_input_z,
		1291	linker_input_l,
1291	};	1292	};
1292		1293
1293	const Args = struct {	1294	const Args = struct {

src/main.cpp+3

 @@ -735,6 +735,9 @@ static int main0(int argc, char **argv) {
                     linker_args.append(buf_create_from_str("-z"));
                     linker_args.append(buf_create_from_str(it.only_arg));
                     break;
+                case Stage2ClangArgLinkerInputL:
+                    lib_dirs.append(it.only_arg);
+                    break;
             }
         }
         // Parse linker args

src/stage2.h+1

...	@@ -347,6 +347,7 @@ enum Stage2ClangArg {	...	@@ -347,6 +347,7 @@ enum Stage2ClangArg {
347	Stage2ClangArgVerboseCmds,	347	Stage2ClangArgVerboseCmds,
348	Stage2ClangArgForLinker,	348	Stage2ClangArgForLinker,
349	Stage2ClangArgLinkerInputZ,	349	Stage2ClangArgLinkerInputZ,
		350	Stage2ClangArgLinkerInputL,
350	};	351	};
351		352
352	// ABI warning	353	// ABI warning

tools/update_clang_options.zig+8

...	@@ -174,6 +174,14 @@ const known_options = [_]KnownOpt{	...	@@ -174,6 +174,14 @@ const known_options = [_]KnownOpt{
174	.name = "###",	174	.name = "###",
175	.ident = "verbose_cmds",	175	.ident = "verbose_cmds",
176	},	176	},
		177	.{
		178	.name = "L",
		179	.ident = "linker_input_l",
		180	},
		181	.{
		182	.name = "library-directory",
		183	.ident = "linker_input_l",
		184	},
177	};	185	};
178		186
179	const blacklisted_options = [_][]const u8{};	187	const blacklisted_options = [_][]const u8{};