maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

ELF2: Define a utility function to handle simple command line options. 

llvm-svn: 249592
This commit is contained in:
Rui Ueyama 2015-10-07 19:34:51 +00:00
parent 39234fc67e
commit 2cac5843a0
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/ELF/Config.h
View File

@ -29,8 +29,8 @@ enum ELFKind {
struct Configuration {
llvm::StringRef DynamicLinker;
llvm::StringRef Entry;
llvm::StringRef Fini = "_fini";
llvm::StringRef Init = "_init";
llvm::StringRef Fini;
llvm::StringRef Init;
llvm::StringRef OutputFile;
llvm::StringRef SoName;
llvm::StringRef Sysroot;

40
lld/ELF/Driver.cpp
View File

@ -139,18 +139,19 @@ void LinkerDriver::addFile(StringRef Path) {
}
}
static StringRef
getString(opt::InputArgList &Args, unsigned Key, StringRef Default = "") {
if (auto *Arg = Args.getLastArg(Key))
return Arg->getValue();
return Default;
}
void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
// Parse command line options.
opt::InputArgList Args = Parser.parse(ArgsArr);
if (auto *Arg = Args.getLastArg(OPT_output))
Config->OutputFile = Arg->getValue();
if (auto *Arg = Args.getLastArg(OPT_dynamic_linker))
Config->DynamicLinker = Arg->getValue();
if (auto *Arg = Args.getLastArg(OPT_sysroot))
Config->Sysroot = Arg->getValue();
for (auto *Arg : Args.filtered(OPT_L))
Config->InputSearchPaths.push_back(Arg->getValue());
std::vector<StringRef> RPaths;
for (auto *Arg : Args.filtered(OPT_rpath))
@ -158,21 +159,6 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
if (!RPaths.empty())
Config->RPath = llvm::join(RPaths.begin(), RPaths.end(), ":");
for (auto *Arg : Args.filtered(OPT_L))
Config->InputSearchPaths.push_back(Arg->getValue());
if (auto *Arg = Args.getLastArg(OPT_entry))
Config->Entry = Arg->getValue();
if (auto *Arg = Args.getLastArg(OPT_fini))
Config->Fini = Arg->getValue();
if (auto *Arg = Args.getLastArg(OPT_init))
Config->Init = Arg->getValue();
if (auto *Arg = Args.getLastArg(OPT_soname))
Config->SoName = Arg->getValue();
if (auto *Arg = Args.getLastArg(OPT_m))
setELFType(Arg->getValue());
@ -186,6 +172,14 @@ void LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
Config->NoUndefined = Args.hasArg(OPT_no_undefined);
Config->Shared = Args.hasArg(OPT_shared);
Config->DynamicLinker = getString(Args, OPT_dynamic_linker);
Config->Entry = getString(Args, OPT_entry);
Config->Fini = getString(Args, OPT_fini, "_fini");
Config->Init = getString(Args, OPT_init, "_init");
Config->OutputFile = getString(Args, OPT_output);
Config->SoName = getString(Args, OPT_soname);
Config->Sysroot = getString(Args, OPT_sysroot);
for (auto *Arg : Args.filtered(OPT_z))
if (Arg->getValue() == StringRef("now"))
Config->ZNow = true;