Skip to content

Commit

Permalink
[ELF] Fix the semantic of PROVIDE in linker scripts.
Browse files Browse the repository at this point in the history
PROVIDE request us to define a symbol only if it is referenced and is
not defined by any object included in the link. We created the
symbol in the symbol table no matter what.

Differential Revision:  https://reviews.llvm.org/D22739

llvm-svn: 276592
  • Loading branch information
dcci committed Jul 25, 2016
1 parent 249b03e commit 373a533
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
4 changes: 3 additions & 1 deletion lld/ELF/LinkerScript.cpp
Expand Up @@ -350,7 +350,9 @@ template <class ELFT> void LinkerScript<ELFT>::addScriptedSymbols() {
continue;

SymbolBody *B = Symtab<ELFT>::X->find(Cmd->Name);
if (!B || B->isUndefined())
// The semantic of PROVIDE is that of introducing a symbol only if
// it's not defined and there's at least a reference to it.
if ((!B && !Cmd->Provide) || (B && B->isUndefined()))
Symtab<ELFT>::X->addAbsolute(Cmd->Name,
Cmd->Hidden ? STV_HIDDEN : STV_DEFAULT);
else
Expand Down
22 changes: 22 additions & 0 deletions lld/test/ELF/linkerscript/linkerscript-symbolreferenced.s
@@ -0,0 +1,22 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t

# Provide new symbol. The value should be 1, like set in PROVIDE()
# RUN: echo "SECTIONS { PROVIDE(newsym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=PROVIDE1 %s
# PROVIDE1: 0000000000000001 *ABS* 00000000 newsym

# Provide new symbol (hidden). The value should be 1
# RUN: echo "SECTIONS { PROVIDE_HIDDEN(newsym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=HIDDEN1 %s
# HIDDEN1: 0000000000000001 *ABS* 00000000 .hidden newsym

.global _start
_start:
nop

.globl patatino
patatino:
movl newsym, %eax
8 changes: 4 additions & 4 deletions lld/test/ELF/linkerscript/linkerscript-symbols.s
Expand Up @@ -9,17 +9,17 @@
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=SIMPLE %s
# SIMPLE: 0000000000000121 *ABS* 00000000 text_end

# Provide new symbol. The value should be 1, like set in PROVIDE()
# The symbol is not referenced. Don't provide it.
# RUN: echo "SECTIONS { PROVIDE(newsym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=PROVIDE1 %s
# PROVIDE1: 0000000000000001 *ABS* 00000000 newsym
# PROVIDE1-NOT: 0000000000000001 *ABS* 00000000 newsym

# Provide new symbol (hidden). The value should be 1
# The symbol is not referenced. Don't provide it.
# RUN: echo "SECTIONS { PROVIDE_HIDDEN(newsym = 1);}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck --check-prefix=HIDDEN1 %s
# HIDDEN1: 0000000000000001 *ABS* 00000000 .hidden newsym
# HIDDEN1-NOT: 0000000000000001 *ABS* 00000000 .hidden newsym

# Provide existing symbol. The value should be 0, even though we
# have value of 1 in PROVIDE()
Expand Down

0 comments on commit 373a533

Please sign in to comment.