<div dir="ltr">I think this needs to be cherry picked for 6.0.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jan 23, 2018 at 8:59 AM, Rafael Espindola 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: rafael<br>
Date: Tue Jan 23 08:59:20 2018<br>
New Revision: 323221<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=323221&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=323221&view=rev</a><br>
Log:<br>
Don't mark a shared library as needed because of a lazy symbol.<br>
<br>
Fixes PR36029.<br>
<br>
Added:<br>
    lld/trunk/test/ELF/Inputs/as-<wbr>needed-lazy.s<br>
    lld/trunk/test/ELF/as-needed-<wbr>lazy.s<br>
Modified:<br>
    lld/trunk/ELF/SymbolTable.cpp<br>
<br>
Modified: lld/trunk/ELF/SymbolTable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SymbolTable.cpp?rev=323221&r1=323220&r2=323221&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/ELF/<wbr>SymbolTable.cpp?rev=323221&r1=<wbr>323220&r2=323221&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/ELF/SymbolTable.cpp (original)<br>
+++ lld/trunk/ELF/SymbolTable.cpp Tue Jan 23 08:59:20 2018<br>
@@ -491,12 +491,13 @@ void SymbolTable::addShared(<wbr>StringRef Na<br>
   if (WasInserted ||<br>
       ((S->isUndefined() || S->isLazy()) && S->Visibility == STV_DEFAULT)) {<br>
     uint8_t Binding = S->Binding;<br>
+    bool WasUndefined = S->isUndefined();<br>
     replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other,<br>
                                 Sym.getType(), Sym.st_value, Sym.st_size,<br>
                                 Alignment, VerdefIndex);<br>
     if (!WasInserted) {<br>
       S->Binding = Binding;<br>
-      if (!S->isWeak() && !Config->GcSections)<br>
+      if (!S->isWeak() && !Config->GcSections && WasUndefined)<br>
         File.IsNeeded = true;<br>
     }<br>
   }<br>
<br>
Added: lld/trunk/test/ELF/Inputs/as-<wbr>needed-lazy.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/as-needed-lazy.s?rev=323221&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/test/ELF/<wbr>Inputs/as-needed-lazy.s?rev=<wbr>323221&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/test/ELF/Inputs/as-<wbr>needed-lazy.s (added)<br>
+++ lld/trunk/test/ELF/Inputs/as-<wbr>needed-lazy.s Tue Jan 23 08:59:20 2018<br>
@@ -0,0 +1,3 @@<br>
+.global foo<br>
+foo:<br>
+  nop<br>
<br>
Added: lld/trunk/test/ELF/as-needed-<wbr>lazy.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/as-needed-lazy.s?rev=323221&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/lld/trunk/test/ELF/as-<wbr>needed-lazy.s?rev=323221&view=<wbr>auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- lld/trunk/test/ELF/as-needed-<wbr>lazy.s (added)<br>
+++ lld/trunk/test/ELF/as-needed-<wbr>lazy.s Tue Jan 23 08:59:20 2018<br>
@@ -0,0 +1,14 @@<br>
+# REQUIRES: x86<br>
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o<br>
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/as-needed-lazy.s -o %t2.o<br>
+# RUN: ld.lld %t2.o -o %t2.so -shared<br>
+# RUN: rm -f %t2.a<br>
+# RUN: llvm-ar rc %t2.a %t2.o<br>
+# RUN: ld.lld %t1.o %t2.a --as-needed %t2.so -o %t<br>
+# RUN: llvm-readobj -d %t | FileCheck %s<br>
+<br>
+# CHECK-NOT: NEEDED<br>
+<br>
+.global _start<br>
+_start:<br>
+  nop<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>