[PATCH] D42977: Don't set dso_local flag in LTO resolutions for absolute symbols defined in ELF objects

[Dmitry Mikulin via Phabricator via llvm-commits]

dmikulin updated this revision to Diff 133090.
dmikulin added a comment.

Addressed review comments


https://reviews.llvm.org/D42977

Files:
  lld/ELF/LTO.cpp
  lld/test/ELF/lto/Inputs/absolute.s
  lld/test/ELF/lto/abs-resol.ll


Index: lld/test/ELF/lto/abs-resol.ll
===================================================================
--- /dev/null
+++ lld/test/ELF/lto/abs-resol.ll
@@ -0,0 +1,15 @@
+; REQUIRES: x86
+
+; RUN: llvm-as %s -o %t.o
+; RUN: llvm-mc -triple=x86_64-pc-linux %p/Inputs/absolute.s -o %t2.o -filetype=obj
+; RUN: ld.lld %t.o %t2.o -o %t.out -pie
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+ at blah = external global i8, align 1
+
+; Function Attrs: noinline nounwind optnone uwtable
+define i8* @_start() {
+ ret i8* @blah
+}
Index: lld/test/ELF/lto/Inputs/absolute.s
===================================================================
--- /dev/null
+++ lld/test/ELF/lto/Inputs/absolute.s
@@ -0,0 +1,3 @@
+.globl blah
+.equ blah, 0xdeadbeef
+.type blah, at notype
Index: lld/ELF/LTO.cpp
===================================================================
--- lld/ELF/LTO.cpp
+++ lld/ELF/LTO.cpp
@@ -154,8 +154,12 @@
     R.VisibleToRegularObj = Config->Relocatable || Sym->IsUsedInRegularObj ||
                             (R.Prevailing && Sym->includeInDynsym()) ||
                             UsedStartStop.count(ObjSym.getSectionName());
+    const auto *DR = dyn_cast<Defined>(Sym);
     R.FinalDefinitionInLinkageUnit =
-        Sym->isDefined() && (IsExecutable || Sym->Visibility != STV_DEFAULT);
+        (IsExecutable || Sym->Visibility != STV_DEFAULT) && DR &&
+        // Skip absolute symbols from ELF objects, otherwise PC-rel relocations
+        // will be generated by for them, triggering linker errors.
+        !(Sym->File && Sym->File->isElf() && DR->Section == nullptr);
 
     if (R.Prevailing)
       undefine(Sym);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42977.133090.patch
Type: text/x-patch
Size: 1697 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180206/4a8da65d/attachment.bin>