From 4db628cd34d47207a4c63074b71d16544cfd03bf Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 27 Oct 2010 18:45:20 +0000 Subject: [PATCH] Set default type and flags for .init and .fini. llvm-svn: 117471 --- lib/MC/MCParser/ELFAsmParser.cpp | 10 +++++++++- test/MC/ELF/section.s | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/lib/MC/MCParser/ELFAsmParser.cpp b/lib/MC/MCParser/ELFAsmParser.cpp index 33fdf98bcfc..83c562bf4a4 100644 --- a/lib/MC/MCParser/ELFAsmParser.cpp +++ b/lib/MC/MCParser/ELFAsmParser.cpp @@ -240,6 +240,15 @@ bool ELFAsmParser::ParseDirectiveSection(StringRef, SMLoc) { return TokError("unexpected token in directive"); unsigned Flags = 0; + unsigned Type = MCSectionELF::SHT_NULL; + + // Set the defaults first. + if (SectionName == ".fini" || SectionName == ".init") { + Type = MCSectionELF::SHT_PROGBITS; + Flags |= MCSectionELF::SHF_ALLOC; + Flags |= MCSectionELF::SHF_EXECINSTR; + } + for (unsigned i = 0; i < FlagsStr.size(); i++) { switch (FlagsStr[i]) { case 'a': @@ -271,7 +280,6 @@ bool ELFAsmParser::ParseDirectiveSection(StringRef, SMLoc) { } } - unsigned Type = MCSectionELF::SHT_NULL; if (!TypeName.empty()) { if (TypeName == "init_array") Type = MCSectionELF::SHT_INIT_ARRAY; diff --git a/test/MC/ELF/section.s b/test/MC/ELF/section.s index cc6fa4c3142..ea89a80f6ef 100644 --- a/test/MC/ELF/section.s +++ b/test/MC/ELF/section.s @@ -9,3 +9,31 @@ // CHECK: ('sh_name', 0x00000012) # '.note.GNU-stack' // CHECK: ('sh_name', 0x00000022) # '.note.GNU-' // CHECK: ('sh_name', 0x0000002d) # '-.note.GNU' + +// Test that the dafults for init and fini are used + +.section .init +.section .fini + +// CHECK: (('sh_name', 0x00000038) # '.init' +// CHECK-NEXT: ('sh_type', 0x00000001) +// CHECK-NEXT: ('sh_flags', 0x00000006) +// CHECK-NEXT: ('sh_addr', 0x00000000) +// CHECK-NEXT: ('sh_offset', 0x00000040) +// CHECK-NEXT: ('sh_size', 0x00000000) +// CHECK-NEXT: ('sh_link', 0x00000000) +// CHECK-NEXT: ('sh_info', 0x00000000) +// CHECK-NEXT: ('sh_addralign', 0x00000001) +// CHECK-NEXT: ('sh_entsize', 0x00000000) +// CHECK-NEXT: ), +// CHECK-NEXT: # Section 0x00000008 +// CHECK-NEXT: (('sh_name', 0x0000003e) # '.fini' +// CHECK-NEXT: ('sh_type', 0x00000001) +// CHECK-NEXT: ('sh_flags', 0x00000006) +// CHECK-NEXT: ('sh_addr', 0x00000000) +// CHECK-NEXT: ('sh_offset', 0x00000040) +// CHECK-NEXT: ('sh_size', 0x00000000) +// CHECK-NEXT: ('sh_link', 0x00000000) +// CHECK-NEXT: ('sh_info', 0x00000000) +// CHECK-NEXT: ('sh_addralign', 0x00000001) +// CHECK-NEXT: ('sh_entsize', 0x00000000)