<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Sun, Feb 1, 2015 at 10:18 PM, Shankar Easwaran <span dir="ltr"><<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The reason was more that the Context should own what is the default search directory. The ELFLinkingContext is using the baseTriple here not the real triple.<br></blockquote><div><br></div><div>Could you please elaborate why you think it should?</div><div><br></div><div>My point was that this patch scattered the logic that used to be in one function and also added a new virtual public function that we used to not need. It doesn't seem like a good tradeoff.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
IMO, Adding target specific search directory in the Gnu driver does not make the code clean.<br>
<br>
Shankar Easwaran<div class="HOEnZb"><div class="h5"><br>
<br>
On 2/2/2015 12:11 AM, Rui Ueyama wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Does this actually improve the code quality? You added a new virtual<br>
function to the linking context, but the linking context are still using<br>
the triple to make a decision. This patch split a private function in the<br>
driver into two, and added them to the linking context as public member<br>
functions. Seems it's slightly worse than before.<br>
<br>
On Sun, Feb 1, 2015 at 10:00 PM, Shankar Easwaran <<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>><br>
wrote:<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: shankare<br>
Date: Mon Feb  2 00:00:04 2015<br>
New Revision: 227784<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=227784&view=rev" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project?rev=227784&view=rev</a><br>
Log:<br>
[ELF] Determine default search directories from Context.<br>
<br>
Target specific LinkingContext's  determine the default search directory.<br>
<br>
No change in functionality.<br>
<br>
Modified:<br>
     lld/trunk/include/lld/Driver/<u></u>Driver.h<br>
     lld/trunk/include/lld/<u></u>ReaderWriter/<u></u>ELFLinkingContext.h<br>
     lld/trunk/lib/Driver/<u></u>GnuLdDriver.cpp<br>
     lld/trunk/lib/ReaderWriter/<u></u>ELF/X86/X86LinkingContext.h<br>
<br>
Modified: lld/trunk/include/lld/Driver/<u></u>Driver.h<br>
URL:<br>
<a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/Driver.h?rev=227784&r1=227783&r2=227784&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/include/lld/<u></u>Driver/Driver.h?rev=227784&r1=<u></u>227783&r2=227784&view=diff</a><br>
<br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/include/lld/Driver/<u></u>Driver.h (original)<br>
+++ lld/trunk/include/lld/Driver/<u></u>Driver.h Mon Feb  2 00:00:04 2015<br>
@@ -87,10 +87,6 @@ private:<br>
    static bool applyEmulation(llvm::Triple &triple,<br>
                               llvm::opt::InputArgList &args,<br>
                               raw_ostream &diag);<br>
-  static void addPlatformSearchDirs(<u></u>ELFLinkingContext &ctx,<br>
-                                    llvm::Triple &triple,<br>
-                                    llvm::Triple &baseTriple);<br>
-<br>
    GnuLdDriver() LLVM_DELETED_FUNCTION;<br>
  };<br>
<br>
<br>
Modified: lld/trunk/include/lld/<u></u>ReaderWriter/<u></u>ELFLinkingContext.h<br>
URL:<br>
<a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=227784&r1=227783&r2=227784&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/include/lld/<u></u>ReaderWriter/<u></u>ELFLinkingContext.h?rev=<u></u>227784&r1=227783&r2=227784&<u></u>view=diff</a><br>
<br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/include/lld/<u></u>ReaderWriter/<u></u>ELFLinkingContext.h (original)<br>
+++ lld/trunk/include/lld/<u></u>ReaderWriter/<u></u>ELFLinkingContext.h Mon Feb  2<br>
00:00:04 2015<br>
@@ -291,6 +291,11 @@ public:<br>
    bool alignSegments() const { return _alignSegments; }<br>
    void setAlignSegments(bool align) { _alignSegments = align; }<br>
<br>
+  /// \brief add platform specific search directories.<br>
+  virtual void addDefaultSearchDirs(llvm::<u></u>Triple & /*triple*/) {<br>
+    addSearchPath("=/usr/lib");<br>
+  }<br>
+<br>
  private:<br>
    ELFLinkingContext() LLVM_DELETED_FUNCTION;<br>
<br>
<br>
Modified: lld/trunk/lib/Driver/<u></u>GnuLdDriver.cpp<br>
URL:<br>
<a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=227784&r1=227783&r2=227784&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/Driver/<u></u>GnuLdDriver.cpp?rev=227784&r1=<u></u>227783&r2=227784&view=diff</a><br>
<br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/Driver/<u></u>GnuLdDriver.cpp (original)<br>
+++ lld/trunk/lib/Driver/<u></u>GnuLdDriver.cpp Mon Feb  2 00:00:04 2015<br>
@@ -311,18 +311,6 @@ bool GnuLdDriver::applyEmulation(<u></u>llvm::T<br>
    return true;<br>
  }<br>
<br>
-void GnuLdDriver::<u></u>addPlatformSearchDirs(<u></u>ELFLinkingContext &ctx,<br>
-                                       llvm::Triple &triple,<br>
-                                       llvm::Triple &baseTriple) {<br>
-  if (triple.getOS() == llvm::Triple::NetBSD &&<br>
-      triple.getArch() == llvm::Triple::x86 &&<br>
-      baseTriple.getArch() == llvm::Triple::x86_64) {<br>
-    ctx.addSearchPath("=/usr/lib/<u></u>i386");<br>
-    return;<br>
-  }<br>
-  ctx.addSearchPath("=/usr/lib")<u></u>;<br>
-}<br>
-<br>
  #define LLVM_TARGET(targetName) \<br>
    if ((p = elf::targetName##<u></u>LinkingContext::create(triple)<u></u>)) return p;<br>
<br>
@@ -403,8 +391,9 @@ bool GnuLdDriver::parse(int argc, const<br>
    for (auto libDir : parsedArgs->filtered(OPT_L))<br>
      ctx->addSearchPath(libDir-><u></u>getValue());<br>
<br>
+  // Add the default search directory specific to the target.<br>
    if (!parsedArgs->hasArg(OPT_<u></u>nostdlib))<br>
-    addPlatformSearchDirs(*ctx, triple, baseTriple);<br>
+    ctx->addDefaultSearchDirs(<u></u>baseTriple);<br>
<br>
    // Handle --demangle option(For compatibility)<br>
    if (parsedArgs->getLastArg(OPT_<u></u>demangle))<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/<u></u>ELF/X86/X86LinkingContext.h<br>
URL:<br>
<a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.h?rev=227784&r1=227783&r2=227784&view=diff" target="_blank">http://llvm.org/viewvc/llvm-<u></u>project/lld/trunk/lib/<u></u>ReaderWriter/ELF/X86/<u></u>X86LinkingContext.h?rev=<u></u>227784&r1=227783&r2=227784&<u></u>view=diff</a><br>
<br>
==============================<u></u>==============================<u></u>==================<br>
--- lld/trunk/lib/ReaderWriter/<u></u>ELF/X86/X86LinkingContext.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/<u></u>ELF/X86/X86LinkingContext.h Mon Feb  2<br>
00:00:04 2015<br>
@@ -36,6 +36,15 @@ public:<br>
        return false;<br>
      }<br>
    }<br>
+<br>
+  void addDefaultSearchDirs(llvm::<u></u>Triple &baseTriple) override {<br>
+    if (_triple.getOS() == llvm::Triple::NetBSD &&<br>
+        baseTriple.getArch() == llvm::Triple::x86_64) {<br>
+      addSearchPath("=/usr/lib/i386"<u></u>);<br>
+      return;<br>
+    }<br>
+    ELFLinkingContext::<u></u>addDefaultSearchDirs(<u></u>baseTriple);<br>
+  }<br>
  };<br>
  } // end namespace elf<br>
  } // end namespace lld<br>
<br>
<br>
______________________________<u></u>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/<u></u>mailman/listinfo/llvm-commits</a><br>
<br>
</blockquote></blockquote>
<br>
<br></div></div><span class="HOEnZb"><font color="#888888">
-- <br>
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by the Linux Foundation<br>
<br>
</font></span></blockquote></div><br></div></div>