[PATCH] D52724: [ELF] - Do not forget to include to .dymsym symbols that were converted to Defined.

[George Rimar via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL343668: [ELF] - Do not forget to include to .dymsym symbols that were converted to… (authored by grimar, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D52724?vs=167887&id=168087#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D52724

Files:
  lld/trunk/ELF/Symbols.cpp
  lld/trunk/test/ELF/local-ver-preemptible.s


Index: lld/trunk/test/ELF/local-ver-preemptible.s
===================================================================
--- lld/trunk/test/ELF/local-ver-preemptible.s
+++ lld/trunk/test/ELF/local-ver-preemptible.s
@@ -0,0 +1,21 @@
+# REQUIRES: x86
+# RUN: echo '.global foo; .type foo, @function; foo:' | \
+# RUN:   llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.so.o
+# RUN: ld.lld %t.so.o -o %t.so -shared
+
+# RUN: echo "{ global: main; local: *; };" > %t.script
+
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o %t.so -o %t -version-script %t.script
+# RUN: llvm-readelf -r --symbols %t | FileCheck %s
+
+# CHECK:      Relocation section '.rela.plt' at offset 0x288 contains 1 entries:
+# CHECK:        R_X86_64_JUMP_SLOT 0000000000201020 foo + 0
+
+# CHECK:      Symbol table '.dynsym' contains 2 entries:
+# CHECK-NEXT:   Num:    Value          Size Type    Bind   Vis      Ndx Name
+# CHECK-NEXT:     0: 0000000000000000     0 NOTYPE  LOCAL  DEFAULT  UND @
+# CHECK-NEXT:     1: 0000000000201020     0 FUNC    GLOBAL DEFAULT  UND foo@
+
+_start:
+  movl $foo - ., %eax
Index: lld/trunk/ELF/Symbols.cpp
===================================================================
--- lld/trunk/ELF/Symbols.cpp
+++ lld/trunk/ELF/Symbols.cpp
@@ -225,7 +225,7 @@
     return Binding;
   if (Visibility != STV_DEFAULT && Visibility != STV_PROTECTED)
     return STB_LOCAL;
-  if (VersionId == VER_NDX_LOCAL && isDefined())
+  if (VersionId == VER_NDX_LOCAL && isDefined() && !IsPreemptible)
     return STB_LOCAL;
   if (!Config->GnuUnique && Binding == STB_GNU_UNIQUE)
     return STB_GLOBAL;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52724.168087.patch
Type: text/x-patch
Size: 1640 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181003/2a57caa6/attachment.bin>