maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Allow overriding reserved symbols in linker scripts 

llvm-svn: 275383
This commit is contained in:
Eugene Leviant 2016-07-14 08:26:41 +00:00
parent 38c2cd0c14
commit 219d9b2b18
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/ELF/LinkerScript.cpp
View File

@ -309,10 +309,10 @@ int LinkerScript<ELFT>::compareSections(StringRef A, StringRef B) {
return I < J ? -1 : 1; return I < J ? -1 : 1;
} }
template <class ELFT> template <class ELFT> void LinkerScript<ELFT>::addScriptedSymbols() {
void LinkerScript<ELFT>::addScriptedSymbols() {
for (SectionsCommand &Cmd : Opt.Commands) for (SectionsCommand &Cmd : Opt.Commands)
if (Cmd.Kind == SymbolAssignmentKind) if (Cmd.Kind == SymbolAssignmentKind &&
Symtab<ELFT>::X->find(Cmd.Name) == nullptr)
Symtab<ELFT>::X->addAbsolute(Cmd.Name, STV_DEFAULT); Symtab<ELFT>::X->addAbsolute(Cmd.Name, STV_DEFAULT);
} }

11
lld/test/ELF/linkerscript-symbol-conflict.s Normal file
View File

@ -0,0 +1,11 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: echo "SECTIONS {.text : {*(.text.*)} end = .;}" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck %s
# CHECK: 0000000000000121 *ABS* 00000000 end
.global _start
_start:
nop