maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Handle .init_array prefix consistently 

Currently, the code in TargetLoweringObjectFile only assigns
@init_array section type to plain .init_array sections, but not
prioritized sections like .init_array.00001.

This is inconsistent with the interpretation in the AsmParser
(see 791523bae6/llvm/lib/MC/MCParser/ELFAsmParser.cpp (L621-L632))
and upcoming expectations in LLD
(see https://github.com/rust-lang/rust/issues/92181 for context).

This patch assigns @init_array section type to all sections with an
.init_array prefix. The same is done for .fini_array and
.preinit_array as well. With that, the logic matches the AsmParser.

Differential Revision: https://reviews.llvm.org/D116528
This commit is contained in:
Nikita Popov 2022-01-03 11:21:05 +01:00
parent bbeaf2aac6
commit 4ef560ec60
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
View File

@ -478,6 +478,11 @@ static SectionKind getELFKindForNamedSection(StringRef Name, SectionKind K) {
return K; return K;
} }
static bool hasPrefix(StringRef SectionName, StringRef Prefix) {
return SectionName.consume_front(Prefix) &&
(SectionName.empty() || SectionName[0] == '.');
}
static unsigned getELFSectionType(StringRef Name, SectionKind K) { static unsigned getELFSectionType(StringRef Name, SectionKind K) {
// Use SHT_NOTE for section whose name starts with ".note" to allow // Use SHT_NOTE for section whose name starts with ".note" to allow
// emitting ELF notes from C variable declaration. // emitting ELF notes from C variable declaration.
@ -485,13 +490,13 @@ static unsigned getELFSectionType(StringRef Name, SectionKind K) {
if (Name.startswith(".note")) if (Name.startswith(".note"))
return ELF::SHT_NOTE; return ELF::SHT_NOTE;
if (Name == ".init_array") if (hasPrefix(Name, ".init_array"))
return ELF::SHT_INIT_ARRAY; return ELF::SHT_INIT_ARRAY;
if (Name == ".fini_array") if (hasPrefix(Name, ".fini_array"))
return ELF::SHT_FINI_ARRAY; return ELF::SHT_FINI_ARRAY;
if (Name == ".preinit_array") if (hasPrefix(Name, ".preinit_array"))
return ELF::SHT_PREINIT_ARRAY; return ELF::SHT_PREINIT_ARRAY;
if (K.isBSS() || K.isThreadBSS()) if (K.isBSS() || K.isThreadBSS())

38
llvm/test/CodeGen/X86/attribute-sections.ll
View File

@ -1,18 +1,36 @@
; RUN: llc < %s -mtriple=i386-unknown-linux-gnu | FileCheck %s -check-prefix=LINUX ; RUN: llc < %s -mtriple=i386-unknown-linux-gnu | FileCheck %s
declare i32 @foo() declare i32 @foo()
@G0 = global i32 ()* @foo, section ".init_array"
; LINUX: .section .init_array,"aw" @init_array1 = global i32 ()* @foo, section ".init_array"
; LINUX: .globl G0 @init_array2 = global i32 ()* @foo, section ".init_array.00001"
@init_array3 = global i32 ()* @foo, section ".init_arrayfoo"
@G1 = global i32 ()* @foo, section ".fini_array" ; CHECK-LABEL: .section .init_array,"aw",@init_array
; CHECK: init_array1:
; CHECK-LABEL: .section .init_array.00001,"aw",@init_array
; CHECK: init_array2:
; CHECK-LABEL: .section .init_arrayfoo,"aw",@progbits
; CHECK: init_array3:
; LINUX: .section .fini_array,"aw" @fini_array1 = global i32 ()* @foo, section ".fini_array"
; LINUX: .globl G1 @fini_array2 = global i32 ()* @foo, section ".fini_array.00001"
@fini_array3 = global i32 ()* @foo, section ".fini_arrayfoo"
@G2 = global i32 ()* @foo, section ".preinit_array" ; CHECK-LABEL: .section .fini_array,"aw",@fini_array
; CHECK: fini_array1:
; CHECK-LABEL: .section .fini_array.00001,"aw",@fini_array
; CHECK: fini_array2:
; CHECK-LABEL: .section .fini_arrayfoo,"aw",@progbits
; CHECK: fini_array3:
; LINUX: .section .preinit_array,"aw" @preinit_array1 = global i32 ()* @foo, section ".preinit_array"
; LINUX: .globl G2 @preinit_array2 = global i32 ()* @foo, section ".preinit_array.00001"
@preinit_array3 = global i32 ()* @foo, section ".preinit_arrayfoo"
; CHECK-LABEL: .section .preinit_array,"aw",@preinit_array
; CHECK: preinit_array1:
; CHECK-LABEL: .section .preinit_array.00001,"aw",@preinit_array
; CHECK: preinit_array2:
; CHECK-LABEL: .section .preinit_arrayfoo,"aw",@progbits
; CHECK: preinit_array3: