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

Rename RPath Rpath for consistency. NFC. 

For an option -foo-bar-baz, we have Config->FooBarBaz. Since -rpath is
-rpath and not -r-path, it should be Config->Rpath instead Config->RPath.

llvm-svn: 301759
This commit is contained in:
Rui Ueyama 2017-04-29 23:06:43 +00:00
parent 85a5e69ced
commit bd27849e4b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/ELF/Config.h
View File

@ -89,7 +89,7 @@ struct Configuration {
llvm::StringRef SoName; llvm::StringRef SoName;
llvm::StringRef Sysroot; llvm::StringRef Sysroot;
llvm::StringRef ThinLTOCacheDir; llvm::StringRef ThinLTOCacheDir;
std::string RPath; std::string Rpath;
std::vector<VersionDefinition> VersionDefinitions; std::vector<VersionDefinition> VersionDefinitions;
std::vector<llvm::StringRef> AuxiliaryList; std::vector<llvm::StringRef> AuxiliaryList;
std::vector<llvm::StringRef> SearchPaths; std::vector<llvm::StringRef> SearchPaths;

4
lld/ELF/Driver.cpp
View File

@ -399,7 +399,7 @@ static std::vector<StringRef> getArgs(opt::InputArgList &Args, int Id) {
return V; return V;
} }
static std::string getRPath(opt::InputArgList &Args) { static std::string getRpath(opt::InputArgList &Args) {
std::vector<StringRef> V = getArgs(Args, OPT_rpath); std::vector<StringRef> V = getArgs(Args, OPT_rpath);
return llvm::join(V.begin(), V.end(), ":"); return llvm::join(V.begin(), V.end(), ":");
} }
@ -640,7 +640,7 @@ void LinkerDriver::readConfigs(opt::InputArgList &Args) {
Config->OutputFile = getString(Args, OPT_o); Config->OutputFile = getString(Args, OPT_o);
Config->Pie = getArg(Args, OPT_pie, OPT_nopie, false); Config->Pie = getArg(Args, OPT_pie, OPT_nopie, false);
Config->PrintGcSections = Args.hasArg(OPT_print_gc_sections); Config->PrintGcSections = Args.hasArg(OPT_print_gc_sections);
Config->RPath = getRPath(Args); Config->Rpath = getRpath(Args);
Config->Relocatable = Args.hasArg(OPT_relocatable); Config->Relocatable = Args.hasArg(OPT_relocatable);
Config->SaveTemps = Args.hasArg(OPT_save_temps); Config->SaveTemps = Args.hasArg(OPT_save_temps);
Config->SearchPaths = getArgs(Args, OPT_L); Config->SearchPaths = getArgs(Args, OPT_L);

4
lld/ELF/SyntheticSections.cpp
View File

@ -1022,9 +1022,9 @@ template <class ELFT> void DynamicSection<ELFT>::addEntries() {
// fixed early. // fixed early.
for (StringRef S : Config->AuxiliaryList) for (StringRef S : Config->AuxiliaryList)
add({DT_AUXILIARY, In<ELFT>::DynStrTab->addString(S)}); add({DT_AUXILIARY, In<ELFT>::DynStrTab->addString(S)});
if (!Config->RPath.empty()) if (!Config->Rpath.empty())
add({Config->EnableNewDtags ? DT_RUNPATH : DT_RPATH, add({Config->EnableNewDtags ? DT_RUNPATH : DT_RPATH,
In<ELFT>::DynStrTab->addString(Config->RPath)}); In<ELFT>::DynStrTab->addString(Config->Rpath)});
for (SharedFile<ELFT> *F : Symtab<ELFT>::X->getSharedFiles()) for (SharedFile<ELFT> *F : Symtab<ELFT>::X->getSharedFiles())
if (F->isNeeded()) if (F->isNeeded())
add({DT_NEEDED, In<ELFT>::DynStrTab->addString(F->SoName)}); add({DT_NEEDED, In<ELFT>::DynStrTab->addString(F->SoName)});