[PATCH] D42486: [ELF][MIPS] Ignore incorrect version definition index for _gp_disp symbol

[Simon Atanasyan via Phabricator via llvm-commits]

This revision was not accepted when it landed; it landed in state "Needs Review".
This revision was automatically updated to reflect the committed changes.
Closed by commit rL324467: [ELF][MIPS] Ignore incorrect version definition index for _gp_disp symbol (authored by atanasyan, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D42486?vs=131402&id=133174#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D42486

Files:
  lld/trunk/ELF/InputFiles.cpp
  lld/trunk/test/ELF/Inputs/mips-gp-dips-corrupt-ver.s
  lld/trunk/test/ELF/Inputs/mips-gp-dips-corrupt-ver.so
  lld/trunk/test/ELF/mips-gp-disp-ver.s


Index: lld/trunk/test/ELF/mips-gp-disp-ver.s
===================================================================
--- lld/trunk/test/ELF/mips-gp-disp-ver.s
+++ lld/trunk/test/ELF/mips-gp-disp-ver.s
@@ -0,0 +1,13 @@
+# MIPS BFD linker puts _gp_disp symbol into DSO files and assigns zero
+# version definition index to it. This value means 'unversioned local symbol'
+# while _gp_disp is a section global symbol. We have to handle this bug
+# in the LLD because BFD linker is used for building MIPS toolchain
+# libraries. This test checks such handling.
+
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o %S/Inputs/mips-gp-dips-corrupt-ver.so
+
+  .global __start
+  .text
+__start:
+  lw     $t0, %got(foo)($gp)
Index: lld/trunk/test/ELF/Inputs/mips-gp-dips-corrupt-ver.s
===================================================================
--- lld/trunk/test/ELF/Inputs/mips-gp-dips-corrupt-ver.s
+++ lld/trunk/test/ELF/Inputs/mips-gp-dips-corrupt-ver.s
@@ -0,0 +1,14 @@
+# Source file for mips-gp-dips-corrupt-ver.so
+#
+# % cat gpdisp.ver
+# LLD_1.0.0 { global: foo; };
+#
+# % as mips-gp-dips-corrupt-ver.s -o mips-gp-dips-corrupt-ver.o
+# % ld -shared -o mips-gp-dips-corrupt-ver.so \
+#      --version-script gpdisp.ver mips-gp-dips-corrupt-ver.o
+
+  .global foo
+  .text
+foo:
+  lui    $t0, %hi(_gp_disp)
+  addi   $t0, $t0, %lo(_gp_disp)
Index: lld/trunk/ELF/InputFiles.cpp
===================================================================
--- lld/trunk/ELF/InputFiles.cpp
+++ lld/trunk/ELF/InputFiles.cpp
@@ -862,6 +862,14 @@
       continue;
     }
 
+    if (Config->EMachine == EM_MIPS) {
+      // FIXME: MIPS BFD linker puts _gp_disp symbol into DSO files
+      // and incorrectly assigns VER_NDX_LOCAL to this section global
+      // symbol. Here is a workaround for this bug.
+      if (Versym && VersymIndex == VER_NDX_LOCAL && Name == "_gp_disp")
+        continue;
+    }
+
     const Elf_Verdef *Ver = nullptr;
     if (VersymIndex != VER_NDX_GLOBAL) {
       if (VersymIndex >= Verdefs.size() || VersymIndex == VER_NDX_LOCAL) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42486.133174.patch
Type: text/x-patch
Size: 2093 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180207/740d7d4f/attachment.bin>