<div dir="ltr">It broke stage2-libc++.so (built by stage1-clang and stage1-lld). I am investigating.<div><a href="http://bb9.pgr.jp/#/builders/20/builds/94">http://bb9.pgr.jp/#/builders/20/builds/94</a></div></div><br><div class="gmail_quote"><div dir="ltr">On Sat, Oct 14, 2017 at 3:07 AM Rafael Espindola via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Fri Oct 13 11:07:11 2017<br>
New Revision: 315721<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=315721&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=315721&view=rev</a><br>
Log:<br>
Handle shared and lazy symbol in the gnu hash construction.<br>
<br>
We were not considering those symbols undefined and they could end up<br>
in the end of the dynamic symbol table.<br>
<br>
Modified:<br>
lld/trunk/ELF/SyntheticSections.cpp<br>
lld/trunk/test/ELF/gc-sections-shared.s<br>
lld/trunk/test/ELF/gnu-hash-table.s<br>
<br>
Modified: lld/trunk/ELF/SyntheticSections.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SyntheticSections.cpp?rev=315721&r1=315720&r2=315721&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/SyntheticSections.cpp?rev=315721&r1=315720&r2=315721&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/SyntheticSections.cpp (original)<br>
+++ lld/trunk/ELF/SyntheticSections.cpp Fri Oct 13 11:07:11 2017<br>
@@ -1608,7 +1608,7 @@ void GnuHashTableSection::addSymbols(std<br>
// its type correctly.<br>
std::vector<SymbolTableEntry>::iterator Mid =<br>
std::stable_partition(V.begin(), V.end(), [](const SymbolTableEntry &S) {<br>
- return S.Symbol->isUndefined();<br>
+ return !S.Symbol->isInCurrentDSO();<br>
});<br>
if (Mid == V.end())<br>
return;<br>
<br>
Modified: lld/trunk/test/ELF/gc-sections-shared.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-shared.s?rev=315721&r1=315720&r2=315721&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gc-sections-shared.s?rev=315721&r1=315720&r2=315721&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/gc-sections-shared.s (original)<br>
+++ lld/trunk/test/ELF/gc-sections-shared.s Fri Oct 13 11:07:11 2017<br>
@@ -19,16 +19,16 @@<br>
# CHECK-NEXT: Section: Undefined (0x0)<br>
# CHECK-NEXT: }<br>
# CHECK-NEXT: Symbol {<br>
-# CHECK-NEXT: Name: bar<br>
+# CHECK-NEXT: Name: bar2<br>
# CHECK-NEXT: Value:<br>
# CHECK-NEXT: Size:<br>
# CHECK-NEXT: Binding: Global<br>
# CHECK-NEXT: Type:<br>
# CHECK-NEXT: Other:<br>
-# CHECK-NEXT: Section: .text<br>
+# CHECK-NEXT: Section: Undefined<br>
# CHECK-NEXT: }<br>
# CHECK-NEXT: Symbol {<br>
-# CHECK-NEXT: Name: foo<br>
+# CHECK-NEXT: Name: bar<br>
# CHECK-NEXT: Value:<br>
# CHECK-NEXT: Size:<br>
# CHECK-NEXT: Binding: Global<br>
@@ -37,13 +37,13 @@<br>
# CHECK-NEXT: Section: .text<br>
# CHECK-NEXT: }<br>
# CHECK-NEXT: Symbol {<br>
-# CHECK-NEXT: Name: bar2<br>
+# CHECK-NEXT: Name: foo<br>
# CHECK-NEXT: Value:<br>
# CHECK-NEXT: Size:<br>
# CHECK-NEXT: Binding: Global<br>
# CHECK-NEXT: Type:<br>
# CHECK-NEXT: Other:<br>
-# CHECK-NEXT: Section: Undefined<br>
+# CHECK-NEXT: Section: .text<br>
# CHECK-NEXT: }<br>
# CHECK-NEXT: ]<br>
<br>
<br>
Modified: lld/trunk/test/ELF/gnu-hash-table.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-hash-table.s?rev=315721&r1=315720&r2=315721&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-hash-table.s?rev=315721&r1=315720&r2=315721&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/gnu-hash-table.s (original)<br>
+++ lld/trunk/test/ELF/gnu-hash-table.s Fri Oct 13 11:07:11 2017<br>
@@ -6,10 +6,29 @@<br>
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t-x86_64.o<br>
# RUN: llvm-mc -filetype=obj -triple=powerpc64-pc-linux %s -o %t-ppc64.o<br>
<br>
+# RUN: echo ".global zed; zed:" > %t2.s<br>
+# RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %t2.s -o %t2-i386.o<br>
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t2.s -o %t2-x86_64.o<br>
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-pc-linux %t2.s -o %t2-ppc64.o<br>
+<br>
+# RUN: rm -f %t2-i386.a %t2-x86_64.a %t2-ppc64.a<br>
+# RUN: llvm-ar rc %t2-i386.a %t2-i386.o<br>
+# RUN: llvm-ar rc %t2-x86_64.a %t2-x86_64.o<br>
+# RUN: llvm-ar rc %t2-ppc64.a %t2-ppc64.o<br>
+<br>
+# RUN: echo ".global xyz; xyz:" > %t3.s<br>
+# RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %t3.s -o %t3-i386.o<br>
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %t3.s -o %t3-x86_64.o<br>
+# RUN: llvm-mc -filetype=obj -triple=powerpc64-pc-linux %t3.s -o %t3-ppc64.o<br>
+<br>
+# RUN: ld.lld -shared %t3-i386.o -o %t3-i386.so<br>
+# RUN: ld.lld -shared %t3-x86_64.o -o %t3-x86_64.so<br>
+# RUN: ld.lld -shared %t3-ppc64.o -o %t3-ppc64.so<br>
+<br>
# RUN: ld.lld -shared --hash-style=gnu -o %te-i386.so %te-i386.o<br>
-# RUN: ld.lld -shared -hash-style=gnu -o %t-i386.so %t-i386.o<br>
-# RUN: ld.lld -shared -hash-style=gnu -o %t-x86_64.so %t-x86_64.o<br>
-# RUN: ld.lld -shared --hash-style both -o %t-ppc64.so %t-ppc64.o<br>
+# RUN: ld.lld -shared -hash-style=gnu -o %t-i386.so %t-i386.o %t2-i386.a %t3-i386.so<br>
+# RUN: ld.lld -shared -hash-style=gnu -o %t-x86_64.so %t-x86_64.o %t2-x86_64.a %t3-x86_64.so<br>
+# RUN: ld.lld -shared --hash-style both -o %t-ppc64.so %t-ppc64.o %t2-ppc64.a %t3-ppc64.so<br>
<br>
# RUN: llvm-readobj -dyn-symbols -gnu-hash-table %te-i386.so \<br>
# RUN: | FileCheck %s -check-prefix=EMPTY<br>
@@ -70,6 +89,16 @@<br>
# I386: Section: Undefined<br>
# I386: }<br>
# I386: Symbol {<br>
+# I386: Name: xyz@<br>
+# I386: Binding: Global<br>
+# I386: Section: Undefined<br>
+# I386: }<br>
+# I386: Symbol {<br>
+# I386: Name: zed@<br>
+# I386: Binding: Weak<br>
+# I386: Section: Undefined<br>
+# I386: }<br>
+# I386: Symbol {<br>
# I386: Name: bar@<br>
# I386: Binding: Global<br>
# I386: Section: .text<br>
@@ -82,11 +111,11 @@<br>
# I386: ]<br>
# I386: GnuHashTable {<br>
# I386-NEXT: Num Buckets: 1<br>
-# I386-NEXT: First Hashed Symbol Index: 2<br>
+# I386-NEXT: First Hashed Symbol Index: 4<br>
# I386-NEXT: Num Mask Words: 1<br>
# I386-NEXT: Shift Count: 5<br>
# I386-NEXT: Bloom Filter: [0x14000220]<br>
-# I386-NEXT: Buckets: [2]<br>
+# I386-NEXT: Buckets: [4]<br>
# I386-NEXT: Values: [0xB8860BA, 0xB887389]<br>
# I386-NEXT: }<br>
<br>
@@ -120,6 +149,16 @@<br>
# X86_64: Section: Undefined<br>
# X86_64: }<br>
# X86_64: Symbol {<br>
+# X86_64: Name: xyz@<br>
+# X86_64: Binding: Global<br>
+# X86_64: Section: Undefined<br>
+# X86_64: }<br>
+# X86_64: Symbol {<br>
+# X86_64: Name: zed@<br>
+# X86_64: Binding: Weak<br>
+# X86_64: Section: Undefined<br>
+# X86_64: }<br>
+# X86_64: Symbol {<br>
# X86_64: Name: bar@<br>
# X86_64: Binding: Global<br>
# X86_64: Section: .text<br>
@@ -132,11 +171,11 @@<br>
# X86_64: ]<br>
# X86_64: GnuHashTable {<br>
# X86_64-NEXT: Num Buckets: 1<br>
-# X86_64-NEXT: First Hashed Symbol Index: 2<br>
+# X86_64-NEXT: First Hashed Symbol Index: 4<br>
# X86_64-NEXT: Num Mask Words: 1<br>
# X86_64-NEXT: Shift Count: 6<br>
# X86_64-NEXT: Bloom Filter: [0x400000000004204]<br>
-# X86_64-NEXT: Buckets: [2]<br>
+# X86_64-NEXT: Buckets: [4]<br>
# X86_64-NEXT: Values: [0xB8860BA, 0xB887389]<br>
# X86_64-NEXT: }<br>
<br>
@@ -170,6 +209,16 @@<br>
# PPC64: Section: Undefined<br>
# PPC64: }<br>
# PPC64: Symbol {<br>
+# PPC64: Name: xyz@<br>
+# PPC64: Binding: Global<br>
+# PPC64: Section: Undefined<br>
+# PPC64: }<br>
+# PPC64: Symbol {<br>
+# PPC64: Name: zed@<br>
+# PPC64: Binding: Weak<br>
+# PPC64: Section: Undefined<br>
+# PPC64: }<br>
+# PPC64: Symbol {<br>
# PPC64: Name: bar@<br>
# PPC64: Binding: Global<br>
# PPC64: Section: .text<br>
@@ -182,14 +231,16 @@<br>
# PPC64: ]<br>
# PPC64: GnuHashTable {<br>
# PPC64-NEXT: Num Buckets: 1<br>
-# PPC64-NEXT: First Hashed Symbol Index: 2<br>
+# PPC64-NEXT: First Hashed Symbol Index: 4<br>
# PPC64-NEXT: Num Mask Words: 1<br>
# PPC64-NEXT: Shift Count: 6<br>
# PPC64-NEXT: Bloom Filter: [0x400000000004204]<br>
-# PPC64-NEXT: Buckets: [2]<br>
+# PPC64-NEXT: Buckets: [4]<br>
# PPC64-NEXT: Values: [0xB8860BA, 0xB887389]<br>
# PPC64-NEXT: }<br>
<br>
.globl foo,bar,baz<br>
foo:<br>
bar:<br>
+.weak zed<br>
+.global xyz<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>