This is an archive of the discontinued LLVM Phabricator instance.

Differential D21788

[ELF] - Remove Config->ZDefs flag.
ClosedPublic

Authored by grimar on Jun 28 2016, 3:17 AM.

Details

Reviewers
ruiu
• rafael
Commits
rGd84f21b28834: [ELF] - Remove Config->ZDefs flag.
rLLD274003: [ELF] - Remove Config->ZDefs flag.
rL274003: [ELF] - Remove Config->ZDefs flag.
Summary

-z defs is the same as --no-undefined (http://linux.die.net/man/1/ld).
It looks to be a error to handle it separatelly.

Diff Detail

Event Timeline

grimar updated this revision to Diff 62072.Jun 28 2016, 3:17 AM
grimar retitled this revision from to [ELF] - Remove Config->ZDefs flag..
grimar updated this object.
grimar added reviewers: ruiu, • rafael.
grimar added subscribers: llvm-commits, grimar.
grimar updated this revision to Diff 62073.Jun 28 2016, 3:21 AM
  • Minor update
grimar updated this revision to Diff 62074.Jun 28 2016, 3:29 AM
  • One more minor update.
ruiu added inline comments.Jun 28 2016, 4:36 AM
ELF/Driver.cpp
366
Config->NoUndefined = Args.hasArg(OPT_no_undefined) || hasZOption(Args, "defs")

would be better.

grimar added inline comments.Jun 28 2016, 4:38 AM
ELF/Driver.cpp
366

Ok. I wanted to leave -z group along, but that also works.

ruiu added inline comments.Jun 28 2016, 4:42 AM
ELF/Driver.cpp
366

I understand, but |= seems too subtle.

grimar updated this revision to Diff 62075.Jun 28 2016, 4:53 AM
  • Addressed review comments.
ruiu accepted this revision.Jun 28 2016, 5:09 AM
ruiu edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jun 28 2016, 5:09 AM
Closed by commit rL274003: [ELF] - Remove Config->ZDefs flag. (authored by grimar). · Explain WhyJun 28 2016, 5:11 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
1 line
2 lines
5 lines

Diff 62074

ELF/Config.h

Show First 20 Lines • Show All 99 Lines • ▼ Show 20 Linesstruct Configuration {
bool StripDebug; bool StripDebug;
bool SysvHash = true; bool SysvHash = true;
bool Threads; bool Threads;
bool Trace; bool Trace;
bool Verbose; bool Verbose;
bool VersionScriptGlobalByDefault = true; bool VersionScriptGlobalByDefault = true;
bool WarnCommon; bool WarnCommon;
bool ZCombreloc; bool ZCombreloc;
bool ZDefs;
bool ZExecStack; bool ZExecStack;
bool ZNodelete; bool ZNodelete;
bool ZNow; bool ZNow;
bool ZOrigin; bool ZOrigin;
bool ZRelro; bool ZRelro;
BuildIdKind BuildId = BuildIdKind::None; BuildIdKind BuildId = BuildIdKind::None;
ELFKind EKind = ELFNoneKind; ELFKind EKind = ELFNoneKind;
uint16_t EMachine = llvm::ELF::EM_NONE; uint16_t EMachine = llvm::ELF::EM_NONE;
Show All 13 Lines

ELF/Driver.cpp

Show First 20 Lines • Show All 357 Lines • ▼ Show 20 Linesvoid LinkerDriver::readConfigs(opt::InputArgList &Args) {
Config->Optimize = getInteger(Args, OPT_O, 1); Config->Optimize = getInteger(Args, OPT_O, 1);
Config->LtoO = getInteger(Args, OPT_lto_O, 2); Config->LtoO = getInteger(Args, OPT_lto_O, 2);
if (Config->LtoO > 3) if (Config->LtoO > 3)
error("invalid optimization level for LTO: " + getString(Args, OPT_lto_O)); error("invalid optimization level for LTO: " + getString(Args, OPT_lto_O));
Config->LtoJobs = getInteger(Args, OPT_lto_jobs, 1); Config->LtoJobs = getInteger(Args, OPT_lto_jobs, 1);
if (Config->LtoJobs == 0) if (Config->LtoJobs == 0)
error("number of threads must be > 0"); error("number of threads must be > 0");
Config->NoUndefined |= hasZOption(Args, "defs");
ruiuUnsubmitted
Not Done
ReplyInline Actions
Config->NoUndefined = Args.hasArg(OPT_no_undefined) || hasZOption(Args, "defs")

would be better.

ruiu: Config->NoUndefined = Args.hasArg(OPT_no_undefined) || hasZOption(Args, "defs") would be…
grimarAuthorUnsubmitted
Not Done
ReplyInline Actions

Ok. I wanted to leave -z group along, but that also works.

grimar: Ok. I wanted to leave -z group along, but that also works.
ruiuUnsubmitted
Not Done
ReplyInline Actions

I understand, but |= seems too subtle.

ruiu: I understand, but `|=` seems too subtle.
Config->ZCombreloc = !hasZOption(Args, "nocombreloc"); Config->ZCombreloc = !hasZOption(Args, "nocombreloc");
Config->ZDefs = hasZOption(Args, "defs");
Config->ZExecStack = hasZOption(Args, "execstack"); Config->ZExecStack = hasZOption(Args, "execstack");
Config->ZNodelete = hasZOption(Args, "nodelete"); Config->ZNodelete = hasZOption(Args, "nodelete");
Config->ZNow = hasZOption(Args, "now"); Config->ZNow = hasZOption(Args, "now");
Config->ZOrigin = hasZOption(Args, "origin"); Config->ZOrigin = hasZOption(Args, "origin");
Config->ZRelro = !hasZOption(Args, "norelro"); Config->ZRelro = !hasZOption(Args, "norelro");
if (Config->Relocatable) if (Config->Relocatable)
Config->StripAll = false; Config->StripAll = false;
▲ Show 20 Lines • Show All 167 Lines • Show Last 20 Lines

ELF/Writer.cpp

Show First 20 Lines • Show All 271 Lines • ▼ Show 20 Lines
}; };
} }
template <class ELFT> template <class ELFT>
static void reportUndefined(SymbolTable<ELFT> &Symtab, SymbolBody *Sym) { static void reportUndefined(SymbolTable<ELFT> &Symtab, SymbolBody *Sym) {
if (!Config->NoUndefined) { if (!Config->NoUndefined) {
if (Config->Relocatable) if (Config->Relocatable)
return; return;
if (Config->Shared && !Config->ZDefs) if (Config->Shared && Sym->symbol()->Visibility == STV_DEFAULT)
if (Sym->symbol()->Visibility == STV_DEFAULT)
return; return;
} }
std::string Msg = "undefined symbol: " + Sym->getName().str(); std::string Msg = "undefined symbol: " + Sym->getName().str();
if (InputFile *File = Sym->getSourceFile<ELFT>()) if (InputFile *File = Sym->getSourceFile<ELFT>())
Msg += " in " + getFilename(File); Msg += " in " + getFilename(File);
if (Config->NoinhibitExec) if (Config->NoinhibitExec)
warning(Msg); warning(Msg);
else else
▲ Show 20 Lines • Show All 1,098 Lines • Show Last 20 Lines