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

Linker script: implement ALIGNOF 

Differential revision: https://reviews.llvm.org/D24141

llvm-svn: 280915
This commit is contained in:
Eugene Leviant 2016-09-08 09:08:30 +00:00
parent 919a58c456
commit 36fac7f0d0
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lld/ELF/LinkerScript.cpp
View File

@ -572,6 +572,15 @@ uint64_t LinkerScript<ELFT>::getOutputSectionSize(StringRef Name) {
return 0;
}
template <class ELFT>
uint64_t LinkerScript<ELFT>::getOutputSectionAlign(StringRef Name) {
for (OutputSectionBase<ELFT> *Sec : *OutputSections)
if (Sec->getName() == Name)
return Sec->getAlignment();
error("undefined section " + Name);
return 0;
}
template <class ELFT> uint64_t LinkerScript<ELFT>::getHeaderSize() {
return Out<ELFT>::ElfHeader->getSize() + Out<ELFT>::ProgramHeaders->getSize();
}
@ -1306,6 +1315,13 @@ Expr ScriptParser::readPrimary() {
expect(")");
return [=](uint64_t Dot) { return ScriptBase->getOutputSectionSize(Name); };
}
if (Tok == "ALIGNOF") {
expect("(");
StringRef Name = next();
expect(")");
return
[=](uint64_t Dot) { return ScriptBase->getOutputSectionAlign(Name); };
}
if (Tok == "SIZEOF_HEADERS")
return [=](uint64_t Dot) { return ScriptBase->getHeaderSize(); };

2
lld/ELF/LinkerScript.h
View File

@ -127,6 +127,7 @@ class LinkerScriptBase {
public:
virtual uint64_t getOutputSectionAddress(StringRef Name) = 0;
virtual uint64_t getOutputSectionSize(StringRef Name) = 0;
virtual uint64_t getOutputSectionAlign(StringRef Name) = 0;
virtual uint64_t getHeaderSize() = 0;
virtual uint64_t getSymbolValue(StringRef S) = 0;
};
@ -173,6 +174,7 @@ public:
bool hasPhdrsCommands();
uint64_t getOutputSectionAddress(StringRef Name) override;
uint64_t getOutputSectionSize(StringRef Name) override;
uint64_t getOutputSectionAlign(StringRef Name) override;
uint64_t getHeaderSize() override;
uint64_t getSymbolValue(StringRef S) override;

41
lld/test/ELF/linkerscript/alignof.s Normal file
View File

@ -0,0 +1,41 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: echo "SECTIONS { \
# RUN: .aaa : { *(.aaa) } \
# RUN: .bbb : { *(.bbb) } \
# RUN: .ccc : { *(.ccc) } \
# RUN: _aaa = ALIGNOF(.aaa); \
# RUN: _bbb = ALIGNOF(.bbb); \
# RUN: _ccc = ALIGNOF(.ccc); \
# RUN: }" > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t
# RUN: llvm-objdump -t %t1 | FileCheck %s
# CHECK: SYMBOL TABLE:
# CHECK: 0000000000000008 *ABS* 00000000 _aaa
# CHECK-NEXT: 0000000000000010 *ABS* 00000000 _bbb
# CHECK-NEXT: 0000000000000020 *ABS* 00000000 _ccc
## Check that we error out if trying to get alignment of
## section that does not exist.
# RUN: echo "SECTIONS { \
# RUN: _aaa = ALIGNOF(.foo); \
# RUN: }" > %t.script
# RUN: not ld.lld -o %t1 --script %t.script %t 2>&1 \
# RUN: | FileCheck -check-prefix=ERR %s
# ERR: undefined section .foo
.global _start
_start:
nop
.section .aaa,"a"
.align 8
.quad 0
.section .bbb,"a"
.align 16
.quad 0
.section .ccc,"a"
.align 32
.quad 0