diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index e624eeda8e677..ceebb03d88f86 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -730,6 +730,12 @@ void LinkerScript::addOrphanSections() { void LinkerScript::diagnoseOrphanHandling() const { for (const InputSectionBase *sec : orphanSections) { + // Input SHT_REL[A] retained by --emit-relocs are ignored by + // computeInputSections(). Don't warn/error. + if (isa(sec) && + cast(sec)->getRelocatedSection()) + continue; + StringRef name = getOutputSectionName(sec); if (config->orphanHandling == OrphanHandlingPolicy::Error) error(toString(sec) + " is being placed in '" + name + "'"); diff --git a/lld/test/ELF/linkerscript/emit-reloc.s b/lld/test/ELF/linkerscript/emit-reloc.s index 4e59588608925..0f3c7b8575112 100644 --- a/lld/test/ELF/linkerscript/emit-reloc.s +++ b/lld/test/ELF/linkerscript/emit-reloc.s @@ -1,9 +1,28 @@ # REQUIRES: x86 +## Test that input SHT_REL[A] retained by --emit-relocs are not matched by input section descriptions. + # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o # RUN: echo "SECTIONS { .rela.dyn : { *(.rela.data) } }" > %t.script # RUN: ld.lld --hash-style=sysv -T %t.script --emit-relocs %t.o -o %t.so -shared # RUN: llvm-readobj -r %t.so | FileCheck %s +## .rela.data is not listed, but don't error. +# RUN: echo 'SECTIONS { \ +# RUN: .dynsym : { *(.dynsym) } \ +# RUN: .gnu.hash : { *(.gnu.hash) } \ +# RUN: .hash : { *(.hash) } \ +# RUN: .dynstr : { *(.dynstr) } \ +# RUN: .dynamic : { *(.dynamic) } \ +# RUN: .rela.dyn : { *(.rela.dyn) } \ +# RUN: .text : { *(.text) } \ +# RUN: .data : { *(.data) } \ +# RUN: .comment : { *(.comment) } \ +# RUN: .symtab : { *(.symtab) } \ +# RUN: .shstrtab : { *(.shstrtab) } \ +# RUN: .strtab : { *(.strtab) } \ +# RUN: }' > %t1.script +# RUN: ld.lld -T %t1.script -shared --emit-relocs %t.o --orphan-handling=error -o /dev/null + .data .quad .foo