[lld] r308930 - If user requested section alignment is greater than MaxPageSize, propagate it to segment headers correctly.

Dmitry Mikulin via llvm-commits llvm-commits at lists.llvm.org
Mon Jul 24 14:27:02 PDT 2017


Author: dmikulin
Date: Mon Jul 24 14:27:02 2017
New Revision: 308930

URL: http://llvm.org/viewvc/llvm-project?rev=308930&view=rev
Log:
If user requested section alignment is greater than MaxPageSize, propagate it to segment headers correctly.

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

Modified:
    lld/trunk/ELF/Writer.cpp
    lld/trunk/test/ELF/linkerscript/align-section-offset.s

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=308930&r1=308929&r2=308930&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Mon Jul 24 14:27:02 2017
@@ -1660,7 +1660,7 @@ template <class ELFT> void Writer<ELFT>:
         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

Modified: lld/trunk/test/ELF/linkerscript/align-section-offset.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript/align-section-offset.s?rev=308930&r1=308929&r2=308930&view=diff
==============================================================================
--- lld/trunk/test/ELF/linkerscript/align-section-offset.s (original)
+++ lld/trunk/test/ELF/linkerscript/align-section-offset.s Mon Jul 24 14:27:02 2017
@@ -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




More information about the llvm-commits mailing list