replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ELF] - Advance position in a memory region when change the Dot. 

This is https://bugs.llvm.org//show_bug.cgi?id=37836

Previously LLD could assign to Dot or set the address
for the section with address expression but did not advance
the position in a memory region.

Patch fixes the issue.

llvm-svn: 336335
This commit is contained in:
George Rimar 2018-07-05 10:44:17 +00:00
parent 13f9425e3a
commit 9b99abcf99
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lld/ELF/LinkerScript.cpp
View File

@ -135,6 +135,9 @@ void LinkerScript::setDot(Expr E, const Twine &Loc, bool InSec) {
// Update to location counter means update to section size. // Update to location counter means update to section size.
if (InSec) if (InSec)
expandOutputSection(Val - Dot); expandOutputSection(Val - Dot);
else
expandMemoryRegions(Val - Dot);
Dot = Val; Dot = Val;
} }

19
lld/test/ELF/linkerscript/memory4.test Normal file
View File

@ -0,0 +1,19 @@
# REQUIRES: x86
# RUN: echo ".section .text,\"ax\"; nop; .section .data,\"aw\"; nop;" \
# RUN: | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t.o
# RUN: ld.lld -o %t.so --script %s %t.o
# RUN: llvm-objdump -section-headers %t.so | FileCheck %s
# CHECK: 1 .text 00000001 0000000000042000
# CHECK-NEXT: 2 .data 00000001 0000000000042400
## Test that address expressions changes the position in a memory region.
MEMORY {
ram (wxa) : ORIGIN = 0x42000, LENGTH = 0x100000
}
SECTIONS {
.text : { *(.text*) }
data_addr = ALIGN(1024);
.data data_addr : { *(.data*) }
}

19
lld/test/ELF/linkerscript/memory5.test Normal file
View File

@ -0,0 +1,19 @@
# REQUIRES: x86
# RUN: echo ".section .text,\"ax\"; nop; .section .data,\"aw\"; nop;" \
# RUN: | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t.o
# RUN: ld.lld -o %t.so --script %s %t.o
# RUN: llvm-objdump -section-headers %t.so | FileCheck %s
# CHECK: 1 .text 00000001 0000000000042000
# CHECK-NEXT: 2 .data 00000001 0000000000044001
## Test that assign to Dot changes the position in a memory region.
MEMORY {
ram (wxa) : ORIGIN = 0x42000, LENGTH = 0x100000
}
SECTIONS {
.text : { *(.text*) }
. += 0x2000;
.data : { *(.data*) }
}