<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Apr 29, 2017 at 4:06 PM, Rui Ueyama via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ruiu<br>
Date: Sat Apr 29 18:06:43 2017<br>
New Revision: 301759<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=301759&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=301759&view=rev</a><br>
Log:<br>
Rename RPath Rpath for consistency. NFC.<br>
<br>
For an option -foo-bar-baz, we have Config->FooBarBaz. Since -rpath is<br>
-rpath and not -r-path, it should be Config->Rpath instead Config->RPath.<br></blockquote><div><br></div><div>Do we describe this convention anywhere in the comments? I think we should (and I don't remember seeing it anywhere).</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
    lld/trunk/ELF/Config.h<br>
    lld/trunk/ELF/Driver.cpp<br>
    lld/trunk/ELF/<wbr>SyntheticSections.cpp<br>
<br>
Modified: lld/trunk/ELF/Config.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Config.h?rev=301759&r1=301758&r2=301759&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/ELF/Config.<wbr>h?rev=301759&r1=301758&r2=<wbr>301759&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/ELF/Config.h (original)<br>
+++ lld/trunk/ELF/Config.h Sat Apr 29 18:06:43 2017<br>
@@ -89,7 +89,7 @@ struct Configuration {<br>
   llvm::StringRef SoName;<br>
   llvm::StringRef Sysroot;<br>
   llvm::StringRef ThinLTOCacheDir;<br>
-  std::string RPath;<br>
+  std::string Rpath;<br>
   std::vector<VersionDefinition> VersionDefinitions;<br>
   std::vector<llvm::StringRef> AuxiliaryList;<br>
   std::vector<llvm::StringRef> SearchPaths;<br>
<br>
Modified: lld/trunk/ELF/Driver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=301759&r1=301758&r2=301759&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/ELF/Driver.<wbr>cpp?rev=301759&r1=301758&r2=<wbr>301759&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/ELF/Driver.cpp (original)<br>
+++ lld/trunk/ELF/Driver.cpp Sat Apr 29 18:06:43 2017<br>
@@ -399,7 +399,7 @@ static std::vector<StringRef> getArgs(op<br>
   return V;<br>
 }<br>
<br>
-static std::string getRPath(opt::InputArgList &Args) {<br>
+static std::string getRpath(opt::InputArgList &Args) {<br>
   std::vector<StringRef> V = getArgs(Args, OPT_rpath);<br>
   return llvm::join(V.begin(), V.end(), ":");<br>
 }<br>
@@ -640,7 +640,7 @@ void LinkerDriver::readConfigs(opt:<wbr>:Inpu<br>
   Config->OutputFile = getString(Args, OPT_o);<br>
   Config->Pie = getArg(Args, OPT_pie, OPT_nopie, false);<br>
   Config->PrintGcSections = Args.hasArg(OPT_print_gc_<wbr>sections);<br>
-  Config->RPath = getRPath(Args);<br>
+  Config->Rpath = getRpath(Args);<br>
   Config->Relocatable = Args.hasArg(OPT_relocatable);<br>
   Config->SaveTemps = Args.hasArg(OPT_save_temps);<br>
   Config->SearchPaths = getArgs(Args, OPT_L);<br>
<br>
Modified: lld/trunk/ELF/<wbr>SyntheticSections.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SyntheticSections.cpp?rev=301759&r1=301758&r2=301759&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/ELF/<wbr>SyntheticSections.cpp?rev=<wbr>301759&r1=301758&r2=301759&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/ELF/<wbr>SyntheticSections.cpp (original)<br>
+++ lld/trunk/ELF/<wbr>SyntheticSections.cpp Sat Apr 29 18:06:43 2017<br>
@@ -1022,9 +1022,9 @@ template <class ELFT> void DynamicSectio<br>
   // fixed early.<br>
   for (StringRef S : Config->AuxiliaryList)<br>
     add({DT_AUXILIARY, In<ELFT>::DynStrTab-><wbr>addString(S)});<br>
-  if (!Config->RPath.empty())<br>
+  if (!Config->Rpath.empty())<br>
     add({Config->EnableNewDtags ? DT_RUNPATH : DT_RPATH,<br>
-         In<ELFT>::DynStrTab-><wbr>addString(Config->RPath)});<br>
+         In<ELFT>::DynStrTab-><wbr>addString(Config->Rpath)});<br>
   for (SharedFile<ELFT> *F : Symtab<ELFT>::X-><wbr>getSharedFiles())<br>
     if (F->isNeeded())<br>
       add({DT_NEEDED, In<ELFT>::DynStrTab-><wbr>addString(F->SoName)});<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>