diff options
| -rw-r--r-- | lld/ELF/Writer.cpp | 8 | ||||
| -rw-r--r-- | lld/test/ELF/linkerscript/orphan-phdrs.s | 34 |
2 files changed, 39 insertions, 3 deletions
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 92888930247..396e9ae1552 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -1031,9 +1031,11 @@ findOrphanPos(std::vector<BaseCommand *>::iterator B, Sec->SortRank < CurSec->SortRank) break; } - auto J = std::find_if( - llvm::make_reverse_iterator(I), llvm::make_reverse_iterator(B), - [](BaseCommand *Cmd) { return isa<OutputSection>(Cmd); }); + auto J = std::find_if(llvm::make_reverse_iterator(I), + llvm::make_reverse_iterator(B), [](BaseCommand *Cmd) { + auto *OS = dyn_cast<OutputSection>(Cmd); + return OS && OS->Live; + }); I = J.base(); // As a special case, if the orphan section is the last section, put diff --git a/lld/test/ELF/linkerscript/orphan-phdrs.s b/lld/test/ELF/linkerscript/orphan-phdrs.s new file mode 100644 index 00000000000..648911162e9 --- /dev/null +++ b/lld/test/ELF/linkerscript/orphan-phdrs.s @@ -0,0 +1,34 @@ +# REQUIRES: x86 +# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t.o +# RUN: echo "PHDRS { \ +# RUN: exec PT_LOAD FLAGS(0x4 | 0x1); \ +# RUN: rw PT_LOAD FLAGS(0x4 | 0x2); \ +# RUN: } \ +# RUN: SECTIONS { \ +# RUN: .text : { *(.text) } :exec \ +# RUN: .empty : { *(.empty) } :rw \ +# RUN: .rw : { *(.rw) } \ +# RUN: }" > %t.script +# RUN: ld.lld -o %t --script %t.script %t.o +# RUN: llvm-readobj -elf-output-style=GNU -s -l %t | FileCheck %s + +## Check that the orphan section is placed correctly and belongs to +## the correct segment. + +# CHECK: Section Headers +# CHECK: .text +# CHECK-NEXT: .orphan +# CHECK-NEXT: .rw + +# CHECK: Segment Sections +# CHECK-NEXT: .text .orphan +# CHECK-NEXT: .rw + +.section .text, "ax" + ret + +.section .rw, "aw" + .quad 0 + +.section .orphan, "ax" + ret |
