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

[ELF] - SEGMENT_START's default argument can be an expression 

Our implementation supported integer value previously.
ld can use expression,
for example, it is OK to write
 . = SEGMENT_START("foobar", .);

Patch implements that.

llvm-svn: 281831
This commit is contained in:
George Rimar 2016-09-17 18:14:56 +00:00
parent 06f85e43cf
commit 8c658bf824
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/ELF/LinkerScript.cpp
View File

@ -1427,11 +1427,9 @@ Expr ScriptParser::readPrimary() {
expect("(");
next();
expect(",");
uint64_t Val;
if (next().getAsInteger(0, Val))
setError("integer expected");
Expr E = readExpr();
expect(")");
return [=](uint64_t Dot) { return Val; };
return [=](uint64_t Dot) { return E(Dot); };
}
if (Tok == "DATA_SEGMENT_ALIGN") {
expect("(");

2
lld/test/ELF/linkerscript/Inputs/segment-start.script
View File

@ -2,6 +2,6 @@ SECTIONS
{
PROVIDE (foobar1 = SEGMENT_START("text-segment", 0x8001));
PROVIDE (foobar2 = SEGMENT_START("data-segment", 0x8002));
PROVIDE (foobar3 = SEGMENT_START("bss-segment", 0x8003));
PROVIDE (foobar3 = SEGMENT_START("bss-segment", 0x8000 + (4 - 1)));
PROVIDE (foobar4 = SEGMENT_START("abc-segment", 0x8004));
}

4
lld/test/ELF/linkerscript/segment-start.s
View File

@ -12,7 +12,7 @@
// CHECK: Name: foobar3
// CHECK-NEXT: Value: 0x8003
// CHECK: Name: foobar
// CHECK: Name: foobar4
// CHECK-NEXT: Value: 0x8004
.data
@ -24,4 +24,4 @@
// RUN: echo "SECTIONS { . = SEGMENT_START(\"foobar\", foo); }" > %t.script
// RUN: not ld.lld %t.o %t.script -shared -o %t2.so 2>&1 \
// RUN: | FileCheck --check-prefix=ERR %s
// ERR: integer expected
// ERR: symbol not found: foo