This is an archive of the discontinued LLVM Phabricator instance.

Differential D45902

Add "-z lazy" and "-z relro".
ClosedPublic

Authored by ruiu on Apr 20 2018, 1:51 PM.

Details

Reviewers
tmsriram
• espindola
Commits
rG88fe5c9557ce: Add -z {combreloc,copyreloc,noexecstack,lazy,relro,text}.
rL330482: Add -z {combreloc,copyreloc,noexecstack,lazy,relro,text}.
rLLD330482: Add -z {combreloc,copyreloc,noexecstack,lazy,relro,text}.
Summary

Add "-z lazy" and "-z relro".

Diff Detail

Event Timeline

ruiu created this revision.Apr 20 2018, 1:51 PM
Herald added a reviewer: • espindola. · View Herald TranscriptApr 20 2018, 1:51 PM
Herald added subscribers: arichardson, emaste. · View Herald Transcript
tmsriram added inline comments.Apr 20 2018, 1:57 PM
lld/ELF/Driver.cpp
762

From man ld , Same here, "combreloc"

765

This is probably ok or maybe needs "copyreloc". In general, should every option here be negatable?

ruiu added inline comments.Apr 20 2018, 2:01 PM
lld/ELF/Driver.cpp
765

I'll add all gold's negative options. I'll upload a new patch.

ruiu updated this revision to Diff 143388.Apr 20 2018, 2:18 PM
  • add more flags
  • add tests
Harbormaster completed remote builds in B17296: Diff 143388.Apr 20 2018, 2:20 PM
• espindola accepted this revision.Apr 20 2018, 2:23 PM

LGTM

This revision is now accepted and ready to land.Apr 20 2018, 2:23 PM
Closed by commit rLLD330482: Add -z {combreloc,copyreloc,noexecstack,lazy,relro,text}. (authored by ruiu). · Explain WhyApr 20 2018, 2:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
ELF/
15 lines

Diff 143382

lld/ELF/Driver.cpp

Show First 20 Lines • Show All 307 Lines • ▼ Show 20 Lines
static bool hasZOption(opt::InputArgList &Args, StringRef Key) { static bool hasZOption(opt::InputArgList &Args, StringRef Key) {
for (auto *Arg : Args.filtered(OPT_z)) for (auto *Arg : Args.filtered(OPT_z))
if (Key == Arg->getValue()) if (Key == Arg->getValue())
return true; return true;
return false; return false;
} }
static bool
getZFlag(opt::InputArgList &Args, StringRef K1, StringRef K2, bool Default) {
for (auto *Arg : llvm::reverse(Args.filtered(OPT_z))) {
if (K1 == Arg->getValue())
return true;
if (K2 == Arg->getValue())
return false;
}
return Default;
}
void LinkerDriver::main(ArrayRef<const char *> ArgsArr) { void LinkerDriver::main(ArrayRef<const char *> ArgsArr) {
ELFOptTable Parser; ELFOptTable Parser;
opt::InputArgList Args = Parser.parse(ArgsArr.slice(1)); opt::InputArgList Args = Parser.parse(ArgsArr.slice(1));
// Interpret this flag early because error() depends on them. // Interpret this flag early because error() depends on them.
errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20); errorHandler().ErrorLimit = args::getInteger(Args, OPT_error_limit, 20);
// Handle -help // Handle -help
▲ Show 20 Lines • Show All 419 Lines • ▼ Show 20 Linesvoid LinkerDriver::readConfigs(opt::InputArgList &Args) {
Config->UndefinedVersion = Config->UndefinedVersion =
Args.hasFlag(OPT_undefined_version, OPT_no_undefined_version, true); Args.hasFlag(OPT_undefined_version, OPT_no_undefined_version, true);
Config->UnresolvedSymbols = getUnresolvedSymbolPolicy(Args); Config->UnresolvedSymbols = getUnresolvedSymbolPolicy(Args);
Config->WarnBackrefs = Config->WarnBackrefs =
Args.hasFlag(OPT_warn_backrefs, OPT_no_warn_backrefs, false); Args.hasFlag(OPT_warn_backrefs, OPT_no_warn_backrefs, false);
Config->WarnCommon = Args.hasFlag(OPT_warn_common, OPT_no_warn_common, false); Config->WarnCommon = Args.hasFlag(OPT_warn_common, OPT_no_warn_common, false);
Config->WarnSymbolOrdering = Config->WarnSymbolOrdering =
Args.hasFlag(OPT_warn_symbol_ordering, OPT_no_warn_symbol_ordering, true); Args.hasFlag(OPT_warn_symbol_ordering, OPT_no_warn_symbol_ordering, true);
Config->ZCombreloc = !hasZOption(Args, "nocombreloc"); Config->ZCombreloc = !hasZOption(Args, "nocombreloc");
tmsriramUnsubmitted
Not Done
ReplyInline Actions

From man ld , Same here, "combreloc"

tmsriram: From man ld , Same here, "combreloc"
Config->ZExecstack = hasZOption(Args, "execstack"); Config->ZExecstack = hasZOption(Args, "execstack");
Config->ZHazardplt = hasZOption(Args, "hazardplt"); Config->ZHazardplt = hasZOption(Args, "hazardplt");
Config->ZNocopyreloc = hasZOption(Args, "nocopyreloc"); Config->ZNocopyreloc = hasZOption(Args, "nocopyreloc");
tmsriramUnsubmitted
Not Done
ReplyInline Actions

This is probably ok or maybe needs "copyreloc". In general, should every option here be negatable?

tmsriram: This is probably ok or maybe needs "copyreloc". In general, should every option here be…
ruiuAuthorUnsubmitted
Not Done
ReplyInline Actions

I'll add all gold's negative options. I'll upload a new patch.

ruiu: I'll add all gold's negative options. I'll upload a new patch.
Config->ZNodelete = hasZOption(Args, "nodelete"); Config->ZNodelete = hasZOption(Args, "nodelete");
Config->ZNodlopen = hasZOption(Args, "nodlopen"); Config->ZNodlopen = hasZOption(Args, "nodlopen");
Config->ZNow = hasZOption(Args, "now"); Config->ZNow = getZFlag(Args, "now", "lazy", true);
Config->ZOrigin = hasZOption(Args, "origin"); Config->ZOrigin = hasZOption(Args, "origin");
Config->ZRelro = !hasZOption(Args, "norelro"); Config->ZRelro = getZFlag(Args, "relro", "norelro", true);
Config->ZRetpolineplt = hasZOption(Args, "retpolineplt"); Config->ZRetpolineplt = hasZOption(Args, "retpolineplt");
Config->ZRodynamic = hasZOption(Args, "rodynamic"); Config->ZRodynamic = hasZOption(Args, "rodynamic");
Config->ZStackSize = args::getZOptionValue(Args, OPT_z, "stack-size", 0); Config->ZStackSize = args::getZOptionValue(Args, OPT_z, "stack-size", 0);
Config->ZText = !hasZOption(Args, "notext"); Config->ZText = !hasZOption(Args, "notext");
Config->ZWxneeded = hasZOption(Args, "wxneeded"); Config->ZWxneeded = hasZOption(Args, "wxneeded");
// Parse LTO plugin-related options for compatibility with gold. // Parse LTO plugin-related options for compatibility with gold.
for (auto *Arg : Args.filtered(OPT_plugin_opt)) { for (auto *Arg : Args.filtered(OPT_plugin_opt)) {
▲ Show 20 Lines • Show All 516 Lines • Show Last 20 Lines