[lld] r307652 - [ELF] - Fix functionality treating IFunc definitions in DSOs as functions.

[George Rimar via llvm-commits]

Author: grimar
Date: Tue Jul 11 04:40:59 2017
New Revision: 307652

URL: http://llvm.org/viewvc/llvm-project?rev=307652&view=rev
Log:
[ELF] - Fix functionality treating IFunc definitions in DSOs as functions.

It was intially implemented in D19517 but then broken.
Patch fixes PR33707, testcase is based on PR's case.

Differential revision: https://reviews.llvm.org/D35119

Added:
    lld/trunk/test/ELF/Inputs/gnu-ifunc-dso.s
    lld/trunk/test/ELF/gnu-ifunc-dso.s
Modified:
    lld/trunk/ELF/Symbols.h

Modified: lld/trunk/ELF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=307652&r1=307651&r2=307652&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.h (original)
+++ lld/trunk/ELF/Symbols.h Tue Jul 11 04:40:59 2017
@@ -218,7 +218,7 @@ public:
         Verdef(Verdef), ElfSym(ElfSym) {
     // IFuncs defined in DSOs are treated as functions by the static linker.
     if (isGnuIFunc())
-      Type = llvm::ELF::STT_FUNC;
+      this->Type = llvm::ELF::STT_FUNC;
     this->File = File;
   }
 

Added: lld/trunk/test/ELF/Inputs/gnu-ifunc-dso.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/gnu-ifunc-dso.s?rev=307652&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/gnu-ifunc-dso.s (added)
+++ lld/trunk/test/ELF/Inputs/gnu-ifunc-dso.s Tue Jul 11 04:40:59 2017
@@ -0,0 +1,3 @@
+.type foo STT_GNU_IFUNC
+.globl foo
+foo:

Added: lld/trunk/test/ELF/gnu-ifunc-dso.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/gnu-ifunc-dso.s?rev=307652&view=auto
==============================================================================
--- lld/trunk/test/ELF/gnu-ifunc-dso.s (added)
+++ lld/trunk/test/ELF/gnu-ifunc-dso.s Tue Jul 11 04:40:59 2017
@@ -0,0 +1,13 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/gnu-ifunc-dso.s -o %t1.o
+# RUN: ld.lld -shared %t1.o -o %t.so
+# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
+# RUN: ld.lld -shared %t2.o %t.so -o %t
+# RUN: llvm-readobj -dyn-relocations %t | FileCheck %s
+
+# CHECK:      Dynamic Relocations {
+# CHECK-NEXT:   0x1000 R_X86_64_64 foo 0x0
+# CHECK-NEXT: }
+
+.data
+ .quad foo