intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-19 01:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ELF] - Fix calculation of memory region offset.

Browse Source 
This is PR33714.

Previously for each input section offset of memory region
was incremented on a size of output section.

That resulted in a wrong error message saying about
overflow. Patch fixes that.

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

llvm-svn: 308955
This commit is contained in:
George Rimar
2017-07-25 08:29:29 +00:00
parent 97c8e09790
commit f694d33f4c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lld/ELF/LinkerScript.cpp
View File

@@ -550,6 +550,7 @@ uint64_t LinkerScript::advance(uint64_t Size, unsigned Align) {
}
void LinkerScript::output(InputSection *S) {
uint64_t Before = advance(0, 1);
uint64_t Pos = advance(S->getSize(), S->Alignment);
S->OutSecOff = Pos - S->getSize() - CurAddressState->OutSec->Addr;
@@ -563,7 +564,7 @@ void LinkerScript::output(InputSection *S) {
if (CurAddressState->MemRegion) {
uint64_t &CurOffset =
CurAddressState->MemRegionOffset[CurAddressState->MemRegion];
CurOffset += CurAddressState->OutSec->Size;
CurOffset += Pos - Before;
uint64_t CurSize = CurOffset - CurAddressState->MemRegion->Origin;
if (CurSize > CurAddressState->MemRegion->Length) {
uint64_t OverflowAmt = CurSize - CurAddressState->MemRegion->Length;

14
lld/test/ELF/linkerscript/memory2.s Normal file
View File

@@ -0,0 +1,14 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
# RUN: echo "MEMORY { ram (rwx) : ORIGIN = 0, LENGTH = 2K } \
# RUN: SECTIONS { .text : { *(.text*) } > ram }" > %t.script
# RUN: ld.lld -o %t2 --script %t.script %t
.text
.global _start
_start:
.zero 1024
.section .text.foo,"ax",%progbits
foo:
nop