[lld] r262642 - Fix PR26818.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Thu Mar  3 12:44:38 2016
New Revision: 262642

URL: http://llvm.org/viewvc/llvm-project?rev=262642&view=rev
Log:
Fix PR26818.

The hack of using a plt address as the address of an undefined function
only works in executables. Don't try it with shared libraries.

Added:
    lld/trunk/test/ELF/no-plt-shared.s
Modified:
    lld/trunk/ELF/Target.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=262642&r1=262641&r2=262642&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Thu Mar  3 12:44:38 2016
@@ -328,7 +328,8 @@ TargetInfo::PltNeed TargetInfo::needsPlt
   // plt. That is identified by special relocation types (R_X86_64_JUMP_SLOT,
   // R_386_JMP_SLOT, etc).
   if (auto *SS = dyn_cast<SharedSymbol<ELFT>>(&S))
-    if (SS->Sym.getType() == STT_FUNC && !refersToGotEntry(Type))
+    if (!Config->Shared && SS->Sym.getType() == STT_FUNC &&
+        !refersToGotEntry(Type))
       return Plt_Implicit;
 
   return Plt_No;

Added: lld/trunk/test/ELF/no-plt-shared.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/no-plt-shared.s?rev=262642&view=auto
==============================================================================
--- lld/trunk/test/ELF/no-plt-shared.s (added)
+++ lld/trunk/test/ELF/no-plt-shared.s Thu Mar  3 12:44:38 2016
@@ -0,0 +1,17 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t.o
+// RUN: ld.lld %t.o -o %t.so -shared
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t2.o
+// RUN: ld.lld %t2.o %t.so -o %t2.so -shared
+// RUN: llvm-readobj -r %t2.so | FileCheck %s
+
+        .data
+fp:
+        .quad bar
+
+// CHECK:      Relocations [
+// CHECK-NEXT:   Section ({{.*}}) .rela.dyn {
+// CHECK-NEXT:     R_X86_64_64 bar 0x0
+// CHECK-NEXT:   }
+// CHECK-NEXT: ]