Skip to content

[Elf] fix linker z_args #11669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[Elf] fix linker z_args #11669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,12 +1655,20 @@ fn buildOutputType(
linker_global_base = parseIntSuffix(arg, "--global-base=".len);
} else if (mem.startsWith(u8, arg, "--export=")) {
try linker_export_symbol_names.append(arg["--export=".len..]);
} else if (mem.eql(u8, arg, "-z")) {
i += 1;
if (i >= linker_args.items.len) {
fatal("expected linker extension flag after '{s}'", .{arg});
}
const z_arg = linker_args.items[i];
} else if (mem.startsWith(u8, arg, "-z")) {
// -z param and -zparam are both supported. z_arg is whatever
// comes after `-z` in either case.
const z_arg = blk: {
if (mem.eql(u8, arg, "-z")) {
i += 1;
if (i >= linker_args.items.len)
fatal("expected linker extension flag after '{s}'", .{arg});
break :blk linker_args.items[i];
} else {
break :blk arg[2..];
}
};

if (mem.eql(u8, z_arg, "nodelete")) {
linker_z_nodelete = true;
} else if (mem.eql(u8, z_arg, "notext")) {
Expand Down