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

[ELF] - Linkerscript: accept integer values for PHDRS types. 

Both gold and ld accepts integers instead of named constants
for PHDRS.
Patch adds support for that.

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

llvm-svn: 284470
This commit is contained in:
George Rimar 2016-10-18 10:49:50 +00:00
parent 3318642466
commit 95dd718c98
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/ELF/LinkerScript.cpp
View File

@ -1706,8 +1706,14 @@ std::vector<StringRef> ScriptParser::readOutputSectionPhdrs() {
return Phdrs;
}
// Read a program header type name. The next token must be a
// name of a program header type or a constant (e.g. "0x3").
unsigned ScriptParser::readPhdrType() {
StringRef Tok = next();
uint64_t Val;
if (readInteger(Tok, Val))
return Val;
unsigned Ret = StringSwitch<unsigned>(Tok)
.Case("PT_NULL", PT_NULL)
.Case("PT_LOAD", PT_LOAD)

23
lld/test/ELF/linkerscript/phdrs.s
View File

@ -47,6 +47,29 @@
# AT-NEXT: PF_X (0x1)
# AT-NEXT: ]
## Check the numetic values for PHDRS.
# RUN: echo "PHDRS {text PT_LOAD FILEHDR PHDRS; foo 0x11223344; } \
# RUN: SECTIONS { . = SIZEOF_HEADERS; .foo : { *(.*) } : text : foo}" > %t1.script
# RUN: ld.lld -o %t2 --script %t1.script %t
# RUN: llvm-readobj -program-headers %t2 | FileCheck --check-prefix=INT-PHDRS %s
# INT-PHDRS: ProgramHeaders [
# INT-PHDRS: ProgramHeader {
# INT-PHDRS: Type: (0x11223344)
# INT-PHDRS-NEXT: Offset: 0xB0
# INT-PHDRS-NEXT: VirtualAddress: 0xB0
# INT-PHDRS-NEXT: PhysicalAddress: 0xB0
# INT-PHDRS-NEXT: FileSize: 9
# INT-PHDRS-NEXT: MemSize: 9
# INT-PHDRS-NEXT: Flags [
# INT-PHDRS-NEXT: PF_R
# INT-PHDRS-NEXT: PF_W
# INT-PHDRS-NEXT: PF_X
# INT-PHDRS-NEXT: ]
# INT-PHDRS-NEXT: Alignment: 4
# INT-PHDRS-NEXT: }
# INT-PHDRS-NEXT: ]
.global _start
_start:
nop