authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-29 16:16:21-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-29 16:18:44-07:00
log66b4bd19c08963b750f6b186739d4ac9402fd896
treeed6772536113d9175355a7f2529bad27710dada2
parent2cdffc97f062feb898f4c8268f1ec6e252077e96

CLI: clarify help text for -z


1 files changed, 5 insertions(+), 5 deletions(-)

src/main.zig+5-5
...@@ -401,7 +401,7 @@ const usage_build_generic =...@@ -401,7 +401,7 @@ const usage_build_generic =
401 \\ -fno-allow-shlib-undefined Disallows undefined symbols in shared libraries401 \\ -fno-allow-shlib-undefined Disallows undefined symbols in shared libraries
402 \\ --eh-frame-hdr Enable C++ exception handling by passing --eh-frame-hdr to linker402 \\ --eh-frame-hdr Enable C++ exception handling by passing --eh-frame-hdr to linker
403 \\ --emit-relocs Enable output of relocation sections for post build tools403 \\ --emit-relocs Enable output of relocation sections for post build tools
404 \\ -z [arg] Append linker arguments404 \\ -z [arg] Set linker extension flags
405 \\ nodelete Indicate that the object cannot be deleted from a process405 \\ nodelete Indicate that the object cannot be deleted from a process
406 \\ notext Permit read-only relocations in read-only segments406 \\ notext Permit read-only relocations in read-only segments
407 \\ defs Force a fatal error if any undefined symbols remain407 \\ defs Force a fatal error if any undefined symbols remain
...@@ -1098,7 +1098,7 @@ fn buildOutputType(...@@ -1098,7 +1098,7 @@ fn buildOutputType(
1098 } else if (mem.eql(u8, arg, "-z")) {1098 } else if (mem.eql(u8, arg, "-z")) {
1099 i += 1;1099 i += 1;
1100 if (i >= args.len) {1100 if (i >= args.len) {
1101 fatal("expected linker arg after '{s}'", .{arg});1101 fatal("expected linker extension flag after '{s}'", .{arg});
1102 }1102 }
1103 const z_arg = args[i];1103 const z_arg = args[i];
1104 if (mem.eql(u8, z_arg, "nodelete")) {1104 if (mem.eql(u8, z_arg, "nodelete")) {
...@@ -1116,7 +1116,7 @@ fn buildOutputType(...@@ -1116,7 +1116,7 @@ fn buildOutputType(
1116 } else if (mem.eql(u8, z_arg, "relro")) {1116 } else if (mem.eql(u8, z_arg, "relro")) {
1117 linker_z_relro = true;1117 linker_z_relro = true;
1118 } else {1118 } else {
1119 warn("unsupported linker arg: -z {s}", .{z_arg});1119 warn("unsupported linker extension flag: -z {s}", .{z_arg});
1120 }1120 }
1121 } else if (mem.eql(u8, arg, "-Bsymbolic")) {1121 } else if (mem.eql(u8, arg, "-Bsymbolic")) {
1122 linker_bind_global_refs_locally = true;1122 linker_bind_global_refs_locally = true;
...@@ -1449,7 +1449,7 @@ fn buildOutputType(...@@ -1449,7 +1449,7 @@ fn buildOutputType(
1449 } else if (mem.eql(u8, arg, "-z")) {1449 } else if (mem.eql(u8, arg, "-z")) {
1450 i += 1;1450 i += 1;
1451 if (i >= linker_args.items.len) {1451 if (i >= linker_args.items.len) {
1452 fatal("expected linker arg after '{s}'", .{arg});1452 fatal("expected linker extension flag after '{s}'", .{arg});
1453 }1453 }
1454 const z_arg = linker_args.items[i];1454 const z_arg = linker_args.items[i];
1455 if (mem.eql(u8, z_arg, "nodelete")) {1455 if (mem.eql(u8, z_arg, "nodelete")) {
...@@ -1467,7 +1467,7 @@ fn buildOutputType(...@@ -1467,7 +1467,7 @@ fn buildOutputType(
1467 } else if (mem.eql(u8, z_arg, "relro")) {1467 } else if (mem.eql(u8, z_arg, "relro")) {
1468 linker_z_relro = true;1468 linker_z_relro = true;
1469 } else {1469 } else {
1470 warn("unsupported linker arg: -z {s}", .{z_arg});1470 warn("unsupported linker extension flag: -z {s}", .{z_arg});
1471 }1471 }
1472 } else if (mem.eql(u8, arg, "--major-image-version")) {1472 } else if (mem.eql(u8, arg, "--major-image-version")) {
1473 i += 1;1473 i += 1;