diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2013-09-15 19:53:20 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2013-09-15 19:53:20 +0000 |
commit | 766f25306af343fb2784350cb4d8cd9ca180f0d3 (patch) | |
tree | c51638c97cb5a38503e0e178931d11ba13fc85d9 | |
parent | bcd9b3b6b119420edffd259e5e05c5e0cf5fbc6c (diff) | |
download | llvm-766f25306af343fb2784350cb4d8cd9ca180f0d3.tar.gz llvm-766f25306af343fb2784350cb4d8cd9ca180f0d3.tar.bz2 llvm-766f25306af343fb2784350cb4d8cd9ca180f0d3.tar.xz |
ELF: Add support for the exclude section bit for gas compat.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@190769 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/Support/ELF.h | 3 | ||||
-rw-r--r-- | lib/MC/MCParser/ELFAsmParser.cpp | 13 | ||||
-rw-r--r-- | lib/MC/MCSectionELF.cpp | 4 | ||||
-rw-r--r-- | lib/Object/ELFYAML.cpp | 1 | ||||
-rw-r--r-- | test/MC/ELF/section.s | 25 | ||||
-rw-r--r-- | tools/llvm-readobj/ELFDumper.cpp | 1 |
6 files changed, 38 insertions, 9 deletions
diff --git a/include/llvm/Support/ELF.h b/include/llvm/Support/ELF.h index 54da31c0de..8f92832795 100644 --- a/include/llvm/Support/ELF.h +++ b/include/llvm/Support/ELF.h @@ -1196,6 +1196,9 @@ enum { // This section holds Thread-Local Storage. SHF_TLS = 0x400U, + // This section is excluded from the final executable or shared library. + SHF_EXCLUDE = 0x80000000U, + // Start of target-specific flags. /// XCORE_SHF_CP_SECTION - All sections with the "c" flag are grouped diff --git a/lib/MC/MCParser/ELFAsmParser.cpp b/lib/MC/MCParser/ELFAsmParser.cpp index 67b0e5df24..7b8a2d0bc5 100644 --- a/lib/MC/MCParser/ELFAsmParser.cpp +++ b/lib/MC/MCParser/ELFAsmParser.cpp @@ -279,14 +279,17 @@ static SectionKind computeSectionKind(unsigned Flags) { return SectionKind::getDataRel(); } -static int parseSectionFlags(StringRef flagsStr, bool *UseLastGroup) { - int flags = 0; +static unsigned parseSectionFlags(StringRef flagsStr, bool *UseLastGroup) { + unsigned flags = 0; for (unsigned i = 0; i < flagsStr.size(); i++) { switch (flagsStr[i]) { case 'a': flags |= ELF::SHF_ALLOC; break; + case 'e': + flags |= ELF::SHF_EXCLUDE; + break; case 'x': flags |= ELF::SHF_EXECINSTR; break; @@ -315,7 +318,7 @@ static int parseSectionFlags(StringRef flagsStr, bool *UseLastGroup) { *UseLastGroup = true; break; default: - return -1; + return -1U; } } @@ -381,8 +384,8 @@ bool ELFAsmParser::ParseSectionArguments(bool IsPush) { StringRef FlagsStr = getTok().getStringContents(); Lex(); - int extraFlags = parseSectionFlags(FlagsStr, &UseLastGroup); - if (extraFlags < 0) + unsigned extraFlags = parseSectionFlags(FlagsStr, &UseLastGroup); + if (extraFlags == -1U) return TokError("unknown flag"); Flags |= extraFlags; diff --git a/lib/MC/MCSectionELF.cpp b/lib/MC/MCSectionELF.cpp index bf1a984a9b..ff9c4d351a 100644 --- a/lib/MC/MCSectionELF.cpp +++ b/lib/MC/MCSectionELF.cpp @@ -75,6 +75,8 @@ void MCSectionELF::PrintSwitchToSection(const MCAsmInfo &MAI, OS << ",#execinstr"; if (Flags & ELF::SHF_WRITE) OS << ",#write"; + if (Flags & ELF::SHF_EXCLUDE) + OS << ",#exclude"; if (Flags & ELF::SHF_TLS) OS << ",#tls"; OS << '\n'; @@ -84,6 +86,8 @@ void MCSectionELF::PrintSwitchToSection(const MCAsmInfo &MAI, OS << ",\""; if (Flags & ELF::SHF_ALLOC) OS << 'a'; + if (Flags & ELF::SHF_EXCLUDE) + OS << 'e'; if (Flags & ELF::SHF_EXECINSTR) OS << 'x'; if (Flags & ELF::SHF_GROUP) diff --git a/lib/Object/ELFYAML.cpp b/lib/Object/ELFYAML.cpp index e530d3dda3..2f35cf9b10 100644 --- a/lib/Object/ELFYAML.cpp +++ b/lib/Object/ELFYAML.cpp @@ -266,6 +266,7 @@ void ScalarBitSetTraits<ELFYAML::ELF_SHF>::bitset(IO &IO, #define BCase(X) IO.bitSetCase(Value, #X, ELF::X); BCase(SHF_WRITE) BCase(SHF_ALLOC) + BCase(SHF_EXCLUDE) BCase(SHF_EXECINSTR) BCase(SHF_MERGE) BCase(SHF_STRINGS) diff --git a/test/MC/ELF/section.s b/test/MC/ELF/section.s index a6794034c9..b3246e0b81 100644 --- a/test/MC/ELF/section.s +++ b/test/MC/ELF/section.s @@ -8,9 +8,9 @@ .section -.note.GNU,"",@progbits // CHECK: Name: .note.GNU-stack (56) -// CHECK: Name: .note.GNU-stack2 (143) -// CHECK: Name: .note.GNU- (160) -// CHECK: Name: -.note.GNU (132) +// CHECK: Name: .note.GNU-stack2 (153) +// CHECK: Name: .note.GNU- (170) +// CHECK: Name: -.note.GNU (142) // Test that the defaults are used @@ -120,11 +120,28 @@ bar: // CHECK-NEXT: EntrySize: 0 // CHECK-NEXT: } +.section .excluded,"e",@progbits + +// CHECK: Section { +// CHECK: Name: .excluded (92) +// CHECK-NEXT: Type: SHT_PROGBITS (0x1) +// CHECK-NEXT: Flags [ (0x80000000) +// CHECK-NEXT: SHF_EXCLUDE (0x80000000) +// CHECK-NEXT: ] +// CHECK-NEXT: Address: 0x0 +// CHECK-NEXT: Offset: 0x50 +// CHECK-NEXT: Size: 0 +// CHECK-NEXT: Link: 0 +// CHECK-NEXT: Info: 0 +// CHECK-NEXT: AddressAlignment: 1 +// CHECK-NEXT: EntrySize: 0 +// CHECK-NEXT: } + // Test that we handle the strings like gas .section bar-"foo" .section "foo" // CHECK: Section { -// CHECK: Name: bar-"foo" (171) +// CHECK: Name: bar-"foo" (181) // CHECK: Section { // CHECK: Name: foo (52) diff --git a/tools/llvm-readobj/ELFDumper.cpp b/tools/llvm-readobj/ELFDumper.cpp index 502fe6750a..71f03bc3d0 100644 --- a/tools/llvm-readobj/ELFDumper.cpp +++ b/tools/llvm-readobj/ELFDumper.cpp @@ -377,6 +377,7 @@ static const char *getElfSectionType(unsigned Arch, unsigned Type) { static const EnumEntry<unsigned> ElfSectionFlags[] = { LLVM_READOBJ_ENUM_ENT(ELF, SHF_WRITE ), LLVM_READOBJ_ENUM_ENT(ELF, SHF_ALLOC ), + LLVM_READOBJ_ENUM_ENT(ELF, SHF_EXCLUDE ), LLVM_READOBJ_ENUM_ENT(ELF, SHF_EXECINSTR ), LLVM_READOBJ_ENUM_ENT(ELF, SHF_MERGE ), LLVM_READOBJ_ENUM_ENT(ELF, SHF_STRINGS ), |