<div dir="ltr">Does this actually improve the code quality? You added a new virtual function to the linking context, but the linking context are still using the triple to make a decision. This patch split a private function in the driver into two, and added them to the linking context as public member functions. Seems it's slightly worse than before.<div class="gmail_extra"><br><div class="gmail_quote">On Sun, Feb 1, 2015 at 10:00 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">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-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/Driver.h<br>
    lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h<br>
    lld/trunk/lib/Driver/GnuLdDriver.cpp<br>
    lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.h<br>
<br>
Modified: lld/trunk/include/lld/Driver/Driver.h<br>
URL: <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-project/lld/trunk/include/lld/Driver/Driver.h?rev=227784&r1=227783&r2=227784&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/include/lld/Driver/Driver.h (original)<br>
+++ lld/trunk/include/lld/Driver/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(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/ReaderWriter/ELFLinkingContext.h<br>
URL: <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-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=227784&r1=227783&r2=227784&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h (original)<br>
+++ lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h Mon Feb  2 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::Triple & /*triple*/) {<br>
+    addSearchPath("=/usr/lib");<br>
+  }<br>
+<br>
 private:<br>
   ELFLinkingContext() LLVM_DELETED_FUNCTION;<br>
<br>
<br>
Modified: lld/trunk/lib/Driver/GnuLdDriver.cpp<br>
URL: <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-project/lld/trunk/lib/Driver/GnuLdDriver.cpp?rev=227784&r1=227783&r2=227784&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/Driver/GnuLdDriver.cpp (original)<br>
+++ lld/trunk/lib/Driver/GnuLdDriver.cpp Mon Feb  2 00:00:04 2015<br>
@@ -311,18 +311,6 @@ bool GnuLdDriver::applyEmulation(llvm::T<br>
   return true;<br>
 }<br>
<br>
-void GnuLdDriver::addPlatformSearchDirs(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/i386");<br>
-    return;<br>
-  }<br>
-  ctx.addSearchPath("=/usr/lib");<br>
-}<br>
-<br>
 #define LLVM_TARGET(targetName) \<br>
   if ((p = elf::targetName##LinkingContext::create(triple))) 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->getValue());<br>
<br>
+  // Add the default search directory specific to the target.<br>
   if (!parsedArgs->hasArg(OPT_nostdlib))<br>
-    addPlatformSearchDirs(*ctx, triple, baseTriple);<br>
+    ctx->addDefaultSearchDirs(baseTriple);<br>
<br>
   // Handle --demangle option(For compatibility)<br>
   if (parsedArgs->getLastArg(OPT_demangle))<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.h<br>
URL: <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-project/lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.h?rev=227784&r1=227783&r2=227784&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/X86/X86LinkingContext.h Mon Feb  2 00:00:04 2015<br>
@@ -36,6 +36,15 @@ public:<br>
       return false;<br>
     }<br>
   }<br>
+<br>
+  void addDefaultSearchDirs(llvm::Triple &baseTriple) override {<br>
+    if (_triple.getOS() == llvm::Triple::NetBSD &&<br>
+        baseTriple.getArch() == llvm::Triple::x86_64) {<br>
+      addSearchPath("=/usr/lib/i386");<br>
+      return;<br>
+    }<br>
+    ELFLinkingContext::addDefaultSearchDirs(baseTriple);<br>
+  }<br>
 };<br>
 } // end namespace elf<br>
 } // end namespace lld<br>
<br>
<br>
_______________________________________________<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/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>