If user requested section alignment is greater than MaxPageSize, propagate it to segment headers correctly.

Differential Revision: https://reviews.llvm.org/D35813

llvm-svn: 308930
This commit is contained in:
Dmitry Mikulin 2017-07-24 21:27:02 +00:00
parent 132689243e
commit 97d6a80895
2 changed files with 3 additions and 2 deletions

View File

@ -1660,7 +1660,7 @@ template <class ELFT> void Writer<ELFT>::setPhdrs() {
P.p_paddr = First->getLMA();
}
if (P.p_type == PT_LOAD)
P.p_align = Config->MaxPageSize;
P.p_align = std::max<uint64_t>(P.p_align, Config->MaxPageSize);
else if (P.p_type == PT_GNU_RELRO) {
P.p_align = 1;
// The glibc dynamic loader rounds the size down, so we need to round up

View File

@ -2,9 +2,10 @@
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
# RUN: echo "SECTIONS { .foo : ALIGN(2M) { *(.foo) } }" > %t.script
# RUN: ld.lld -o %t --script %t.script %t.o -shared
# RUN: llvm-readelf -S %t | FileCheck %s
# RUN: llvm-readelf -S -l %t | FileCheck %s
# CHECK: .foo PROGBITS 0000000000200000 200000 000008 00 WA 0 0 2097152
# CHECK: LOAD 0x200000 0x0000000000200000 0x0000000000200000 {{.*}} RW 0x200000
.section .foo, "aw"
.quad 42