diff options
author | Peter Smith <peter.smith@arm.com> | 2023-05-11 12:00:19 +0100 |
---|---|---|
committer | Peter Smith <peter.smith@arm.com> | 2023-05-15 10:04:33 +0100 |
commit | e16af8a28169172a6cf479ccbc03e145d4590db1 (patch) | |
tree | c84d1390d565721fcee864db71c01e3a9fdc111c /lld | |
parent | 83768e66108f583dcb2807a04662cfb9709ab2cf (diff) | |
download | llvm-e16af8a28169172a6cf479ccbc03e145d4590db1.tar.gz |
[LLD][ELF] Add missing program header parsing to OVERLAY
In D72756 the change to add INPUT_SECTION_FLAGS inadvertantly
removed the line to parse the program header assignment information for
OutputSections within an OVERLAY.
This change adds back the missing line and adds a test for it.
Differential Revision: https://reviews.llvm.org/D150445
Diffstat (limited to 'lld')
-rw-r--r-- | lld/ELF/ScriptParser.cpp | 1 | ||||
-rw-r--r-- | lld/test/ELF/linkerscript/overlay-phdr.test | 33 |
2 files changed, 34 insertions, 0 deletions
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp index d5f2e1fd6117..396d27d9357a 100644 --- a/lld/ELF/ScriptParser.cpp +++ b/lld/ELF/ScriptParser.cpp @@ -898,6 +898,7 @@ OutputDesc *ScriptParser::readOverlaySectionDescription() { osd->osec.commands.push_back( readInputSectionRules(next(), withFlags, withoutFlags)); } + osd->osec.phdrs = readOutputSectionPhdrs(); return osd; } diff --git a/lld/test/ELF/linkerscript/overlay-phdr.test b/lld/test/ELF/linkerscript/overlay-phdr.test new file mode 100644 index 000000000000..baacc1ab3592 --- /dev/null +++ b/lld/test/ELF/linkerscript/overlay-phdr.test @@ -0,0 +1,33 @@ +# REQUIRES: x86 +# RUN: echo 'nop; .section .small, "a"; .long 0; .section .big, "a"; .quad 1;' \ +# RUN: | llvm-mc -filetype=obj -triple=x86_64-unknown-linux - -o %t.o +# RUN: ld.lld %t.o --script %s -o %t + +PHDRS { + PH1 PT_LOAD; + PH2 PT_LOAD; +} + +SECTIONS { + OVERLAY 0x1000 : AT ( 0x4000 ) { + .out.big { *(.big) } : PH1 + .out.small { *(.small) } : PH2 + } +} + +## A variant of overlay.test with explicit program header assingment. +## Check that we generate two program headers consistent with the overlay + +# RUN: llvm-readelf --sections -l %t | FileCheck %s + +# CHECK: Section Headers: +# CHECK: Name Type Address Off Size +# CHECK: .out.big PROGBITS 0000000000001000 001000 000008 +# CHECK: .out.small PROGBITS 0000000000001000 002000 000004 +# CHECK: .text PROGBITS 0000000000001008 002008 000001 + + +# CHECK: Program Headers: +# CHECK: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align +# CHECK-NEXT: LOAD 0x001000 0x0000000000001000 0x0000000000004000 0x000008 0x000008 R 0x1000 +# CHECK-NEXT: LOAD 0x002000 0x0000000000001000 0x0000000000004008 0x000009 0x000009 R E 0x1000 |