Index: lld/ELF/Writer.cpp =================================================================== --- lld/ELF/Writer.cpp +++ lld/ELF/Writer.cpp @@ -819,7 +819,8 @@ StringRef s = sec->name; return s == ".data.rel.ro" || s == ".bss.rel.ro" || s == ".ctors" || s == ".dtors" || s == ".jcr" || s == ".eh_frame" || - s == ".openbsd.randomdata"; + s == ".fini_array" || s == ".init_array" || + s == ".openbsd.randomdata" || s == ".preinit_array"; } // We compute a rank for each section. The rank indicates where the Index: lld/test/ELF/relro-init-fini-script.s =================================================================== --- /dev/null +++ lld/test/ELF/relro-init-fini-script.s @@ -0,0 +1,30 @@ +// REQUIRES: x86 +// RUN: llvm-mc -filetype=obj -triple=x86_64-none-elf %s -o %t.o +// RUN: echo "SECTIONS { \ +// RUN: .dynamic 0x10000 : { *(.dynamic) } \ +// RUN: .preinit_array : { PROVIDE_HIDDEN (__preinit_array_start = .); \ +// RUN: KEEP (*(.preinit_array)) } \ +// RUN: .init_array : { PROVIDE_HIDDEN (__init_array_start = .); \ +// RUN: KEEP (*(.init_array)) } \ +// RUN: .fini_array : { PROVIDE_HIDDEN (__fini_array_start = .); \ +// RUN: KEEP (*(.fini_array)) } \ +// RUN: .data.rel.ro : { *(.data.rel.ro) } \ +// RUN: .data : { *(.data) } } " > %t.script +// RUN: ld.lld %t.o -o %t.so --shared --script=%t.script +// RUN: llvm-readobj --segments %t.so | FileCheck %s + +/// Check that an empty .init_array, .fini_array or .preinit_array that is +/// kept due to symbol references, is still counted as RELRO. + +// CHECK: Type: PT_GNU_RELRO +// CHECK-NEXT: Offset: 0x2000 +// CHECK-NEXT: VirtualAddress: 0x10000 + + .section .data.rel.ro, "aw", %progbits + .global foo + .quad foo + + .data + .quad __init_array_start + .quad __fini_array_start + .quad __preinit_array_start