<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jan 25, 2016 at 12:44 AM, George Rimar 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: grimar<br>
Date: Mon Jan 25 02:44:38 2016<br>
New Revision: 258672<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=258672&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=258672&view=rev</a><br>
Log:<br>
[ELF] - Symbols from object files that override symbols in DSO are added to .dynsym table.<br>
<br>
Main executable did not export symbols that exist both in the main executable and in DSOs before this patch.<br>
Symbols from object files that override symbols in DSO should be added to .dynsym table.<br>
<br>
Differential revision: <a href="http://reviews.llvm.org/D16405" rel="noreferrer" target="_blank">http://reviews.llvm.org/D16405</a><br>
<br>
Added:<br>
lld/trunk/test/ELF/Inputs/symbol-override.s<br>
lld/trunk/test/ELF/symbol-override.s<br>
Modified:<br>
lld/trunk/ELF/Symbols.cpp<br>
lld/trunk/test/ELF/mips-dynamic.s<br>
<br>
Modified: lld/trunk/ELF/Symbols.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.cpp?rev=258672&r1=258671&r2=258672&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.cpp?rev=258672&r1=258671&r2=258672&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Symbols.cpp (original)<br>
+++ lld/trunk/ELF/Symbols.cpp Mon Jan 25 02:44:38 2016<br>
@@ -53,6 +53,13 @@ template <class ELFT> int SymbolBody::co<br>
if (IsUsedInRegularObj || Other->IsUsedInRegularObj)<br>
IsUsedInRegularObj = Other->IsUsedInRegularObj = true;<br>
<br>
+ // We want to export all symbols that exist both in the executable<br>
+ // and in DSOs, so that the symbols in the executable can interrupt<br>
+ // symbols in the DSO at runtime.<br>
+ if (isShared() != Other->isShared())<br>
+ if (isa<DefinedRegular<ELFT>>(isShared() ? Other : this))<br></blockquote><div><br></div><div>You could just roll these two conditions into one:<br><br>if (isShared() != Other->isShared() && isa<DefinedRegular<ELFT>>(...))</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ IsUsedInDynamicReloc = Other->IsUsedInDynamicReloc = true;<br>
+<br>
if (L != R)<br>
return -1;<br>
if (!std::get<0>(L) || !std::get<1>(L) || !std::get<2>(L))<br>
<br>
Added: lld/trunk/test/ELF/Inputs/symbol-override.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/symbol-override.s?rev=258672&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/symbol-override.s?rev=258672&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/Inputs/symbol-override.s (added)<br>
+++ lld/trunk/test/ELF/Inputs/symbol-override.s Mon Jan 25 02:44:38 2016<br>
@@ -0,0 +1,16 @@<br>
+.text<br>
+.globl foo<br>
+.type foo,@function<br>
+foo:<br>
+nop<br>
+<br>
+.globl bar<br>
+.type bar,@function<br>
+bar:<br>
+nop<br>
+<br>
+.globl do<br>
+.type do,@function<br>
+do:<br>
+callq foo@PLT<br>
+callq bar@PLT<br>
<br>
Modified: lld/trunk/test/ELF/mips-dynamic.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-dynamic.s?rev=258672&r1=258671&r2=258672&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-dynamic.s?rev=258672&r1=258671&r2=258672&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/mips-dynamic.s (original)<br>
+++ lld/trunk/test/ELF/mips-dynamic.s Mon Jan 25 02:44:38 2016<br>
@@ -47,8 +47,8 @@<br>
# EXE-DAG: 0x70000005 MIPS_FLAGS NOTPOT<br>
# EXE-DAG: 0x70000006 MIPS_BASE_ADDRESS<br>
# EXE-DAG: 0x7000000A MIPS_LOCAL_GOTNO 2<br>
-# EXE-DAG: 0x70000011 MIPS_SYMTABNO 1<br>
-# EXE-DAG: 0x70000013 MIPS_GOTSYM 0x1<br>
+# EXE-DAG: 0x70000011 MIPS_SYMTABNO 2<br>
+# EXE-DAG: 0x70000013 MIPS_GOTSYM 0x2<br>
# EXE-DAG: 0x70000016 MIPS_RLD_MAP [[RLDMAPADDR]]<br>
# EXE: ]<br>
<br>
<br>
Added: lld/trunk/test/ELF/symbol-override.s<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/symbol-override.s?rev=258672&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/symbol-override.s?rev=258672&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/ELF/symbol-override.s (added)<br>
+++ lld/trunk/test/ELF/symbol-override.s Mon Jan 25 02:44:38 2016<br>
@@ -0,0 +1,46 @@<br>
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1.o<br>
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/symbol-override.s -o %t2.o<br>
+// RUN: ld.lld -shared %t2.o -o %t2.so<br>
+// RUN: ld.lld %t1.o %t2.so -o %t<br>
+// RUN: llvm-readobj -dyn-symbols %t | FileCheck %s<br>
+<br>
+// CHECK: DynamicSymbols [<br>
+// CHECK-NEXT: Symbol {<br>
+// CHECK-NEXT: Name:<br>
+// CHECK-NEXT: Value: 0x0<br>
+// CHECK-NEXT: Size: 0<br>
+// CHECK-NEXT: Binding: Local<br>
+// CHECK-NEXT: Type: None<br>
+// CHECK-NEXT: Other: 0<br>
+// CHECK-NEXT: Section: Undefined<br>
+// CHECK-NEXT: }<br>
+// CHECK-NEXT: Symbol {<br>
+// CHECK-NEXT: Name: do<br>
+// CHECK-NEXT: Value: 0x0<br>
+// CHECK-NEXT: Size: 0<br>
+// CHECK-NEXT: Binding: Global<br>
+// CHECK-NEXT: Type: Function<br>
+// CHECK-NEXT: Other: 0<br>
+// CHECK-NEXT: Section: Undefined<br>
+// CHECK-NEXT: }<br>
+// CHECK-NEXT: Symbol {<br>
+// CHECK-NEXT: Name: foo<br>
+// CHECK-NEXT: Value: 0x11000<br>
+// CHECK-NEXT: Size: 0<br>
+// CHECK-NEXT: Binding: Global<br>
+// CHECK-NEXT: Type: Function<br>
+// CHECK-NEXT: Other: 0<br>
+// CHECK-NEXT: Section: .text<br>
+// CHECK-NEXT: }<br>
+// CHECK-NEXT: ]<br>
+<br>
+.text<br>
+.globl foo<br>
+.type foo,@function<br>
+foo:<br>
+nop<br>
+<br>
+.text<br>
+.globl _start<br>
+_start:<br>
+callq do<br>
<br>
<br>
_______________________________________________<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/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>