diff options
-rw-r--r-- | lld/ELF/SymbolTable.cpp | 1 | ||||
-rw-r--r-- | lld/ELF/Symbols.h | 3 | ||||
-rw-r--r-- | lld/test/ELF/lto/Inputs/shared.s | 5 | ||||
-rw-r--r-- | lld/test/ELF/lto/undefined-puts.ll | 28 |
4 files changed, 36 insertions, 1 deletions
diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp index dd11406bc37..017ac832c87 100644 --- a/lld/ELF/SymbolTable.cpp +++ b/lld/ELF/SymbolTable.cpp @@ -108,6 +108,7 @@ template <class ELFT> void SymbolTable<ELFT>::addCombinedLtoObject() { Obj->parse(DummyGroups); for (SymbolBody *Body : Obj->getNonLocalSymbols()) { Symbol *Sym = insert(Body); + Sym->Body->setUsedInRegularObj(); if (!Sym->Body->isUndefined() && Body->isUndefined()) continue; Sym->Body = Body; diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h index f316f83e504..8db6e22f022 100644 --- a/lld/ELF/Symbols.h +++ b/lld/ELF/Symbols.h @@ -89,6 +89,8 @@ public: bool isInGot() const { return GotIndex != -1U; } bool isInPlt() const { return PltIndex != -1U; } + void setUsedInRegularObj() { IsUsedInRegularObj = true; } + template <class ELFT> typename ELFT::uint getVA(typename ELFT::uint Addend = 0) const; @@ -319,7 +321,6 @@ public: std::unique_ptr<InputFile> getMember(); void setWeak() { IsWeak = true; } - void setUsedInRegularObj() { IsUsedInRegularObj = true; } private: ArchiveFile *File; diff --git a/lld/test/ELF/lto/Inputs/shared.s b/lld/test/ELF/lto/Inputs/shared.s new file mode 100644 index 00000000000..d1ef371e53e --- /dev/null +++ b/lld/test/ELF/lto/Inputs/shared.s @@ -0,0 +1,5 @@ +.globl printf +printf: + +.globl puts +puts: diff --git a/lld/test/ELF/lto/undefined-puts.ll b/lld/test/ELF/lto/undefined-puts.ll new file mode 100644 index 00000000000..3216ff4b4cc --- /dev/null +++ b/lld/test/ELF/lto/undefined-puts.ll @@ -0,0 +1,28 @@ +; REQUIRES: x86 +; RUN: llvm-mc %p/Inputs/shared.s -o %t1.o -filetype=obj -triple=x86_64-unknown-linux +; RUN: ld.lld %t1.o -o %t1.so -shared +; RUN: llvm-as %s -o %t2.o +; RUN: ld.lld %t1.so %t2.o -m elf_x86_64 -o %t +; RUN: llvm-readobj -dyn-symbols -dyn-relocations %t | FileCheck %s + +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +@.str = private unnamed_addr constant [6 x i8] c"blah\0A\00", align 1 + +define i32 @_start() { + %str = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([6 x i8], [6 x i8]* @.str, i32 0, i32 0)) + ret i32 0 +} + +declare i32 @printf(i8*, ...) + +; Check that puts symbol is present in the dynamic symbol table and +; there's a relocation for it. +; CHECK: Dynamic Relocations { +; CHECK-NEXT: 0x11007 R_X86_64_PC32 puts 0xFFFFFFFFFFFFFFFC +; CHECK-NEXT: } + +; CHECK: DynamicSymbols [ +; CHECK: Symbol { +; CHECK: Name: puts@ |