From 819c4f365fe2bf9be75faafa667fb22366dabaf5 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 22 Jul 2009 23:27:22 +0000 Subject: [PATCH] remove SectionFlags::Small: it is only used on Xcore, and we'll find a better solution for it in the future. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76818 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetAsmInfo.h | 1 - lib/Target/ELFTargetAsmInfo.cpp | 2 -- lib/Target/Mips/MipsTargetAsmInfo.cpp | 8 -------- lib/Target/Mips/MipsTargetAsmInfo.h | 6 ------ lib/Target/TargetAsmInfo.cpp | 3 +-- lib/Target/XCore/XCoreTargetAsmInfo.cpp | 17 ++++++----------- 6 files changed, 7 insertions(+), 30 deletions(-) diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h index 01404334138..447297cddc3 100644 --- a/include/llvm/Target/TargetAsmInfo.h +++ b/include/llvm/Target/TargetAsmInfo.h @@ -85,7 +85,6 @@ namespace llvm { const unsigned TLS = 1 << 5; ///< Section contains thread-local data const unsigned Debug = 1 << 6; ///< Section contains debug data const unsigned Linkonce = 1 << 7; ///< Section is linkonce - const unsigned Small = 1 << 8; ///< Section is small const unsigned TypeFlags = 0xFF; // Some gap for future flags const unsigned Named = 1 << 23; ///< Section is named diff --git a/lib/Target/ELFTargetAsmInfo.cpp b/lib/Target/ELFTargetAsmInfo.cpp index b5babed817d..8cadb530793 100644 --- a/lib/Target/ELFTargetAsmInfo.cpp +++ b/lib/Target/ELFTargetAsmInfo.cpp @@ -207,8 +207,6 @@ std::string ELFTargetAsmInfo::printSectionFlags(unsigned flags) const { Flags += 'S'; if (flags & SectionFlags::TLS) Flags += 'T'; - if (flags & SectionFlags::Small) - Flags += 's'; Flags += "\","; diff --git a/lib/Target/Mips/MipsTargetAsmInfo.cpp b/lib/Target/Mips/MipsTargetAsmInfo.cpp index c197b0c2981..f086db02d26 100644 --- a/lib/Target/Mips/MipsTargetAsmInfo.cpp +++ b/lib/Target/Mips/MipsTargetAsmInfo.cpp @@ -45,14 +45,6 @@ MipsTargetAsmInfo::MipsTargetAsmInfo(const MipsTargetMachine &TM): } -unsigned MipsTargetAsmInfo:: -SectionFlagsForGlobal(const GlobalValue *GV, const char* Name) const { - unsigned Flags = ELFTargetAsmInfo::SectionFlagsForGlobal(GV, Name); - // Mask out Small Section flag bit, Mips doesnt support 's' section symbol - // for its small sections. - return (Flags & (~SectionFlags::Small)); -} - SectionKind::Kind MipsTargetAsmInfo:: SectionKindForGlobal(const GlobalValue *GV) const { SectionKind::Kind K = ELFTargetAsmInfo::SectionKindForGlobal(GV); diff --git a/lib/Target/Mips/MipsTargetAsmInfo.h b/lib/Target/Mips/MipsTargetAsmInfo.h index 2b5a739e721..74bba10b239 100644 --- a/lib/Target/Mips/MipsTargetAsmInfo.h +++ b/lib/Target/Mips/MipsTargetAsmInfo.h @@ -34,12 +34,6 @@ namespace llvm { virtual SectionKind::Kind SectionKindForGlobal(const GlobalValue *GV) const; - /// SectionFlagsForGlobal - This hook allows the target to select proper - /// section flags either for given global or for section. - virtual unsigned - SectionFlagsForGlobal(const GlobalValue *GV = NULL, - const char* name = NULL) const; - virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const; private: diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp index a2fe4185e9a..1af112c7925 100644 --- a/lib/Target/TargetAsmInfo.cpp +++ b/lib/Target/TargetAsmInfo.cpp @@ -260,9 +260,8 @@ TargetAsmInfo::SectionFlagsForGlobal(const GlobalValue *GV, case SectionKind::SmallData: case SectionKind::SmallBSS: Flags |= SectionFlags::Writeable; - // FALLS THROUGH + break; case SectionKind::SmallROData: - Flags |= SectionFlags::Small; break; default: llvm_unreachable("Unexpected section kind!"); diff --git a/lib/Target/XCore/XCoreTargetAsmInfo.cpp b/lib/Target/XCore/XCoreTargetAsmInfo.cpp index 842c427b3b2..6fc6dc2c7b3 100644 --- a/lib/Target/XCore/XCoreTargetAsmInfo.cpp +++ b/lib/Target/XCore/XCoreTargetAsmInfo.cpp @@ -25,10 +25,9 @@ XCoreTargetAsmInfo::XCoreTargetAsmInfo(const XCoreTargetMachine &TM) : ELFTargetAsmInfo(TM) { SupportsDebugInformation = true; TextSection = getUnnamedSection("\t.text", SectionFlags::Code); - DataSection = getNamedSection("\t.dp.data", SectionFlags::Writeable | - SectionFlags::Small); + DataSection = getNamedSection("\t.dp.data", SectionFlags::Writeable); BSSSection_ = getNamedSection("\t.dp.bss", SectionFlags::Writeable | - SectionFlags::BSS | SectionFlags::Small); + SectionFlags::BSS); // TLS globals are lowered in the backend to arrays indexed by the current // thread id. After lowering they require no special handling by the linker @@ -36,14 +35,10 @@ XCoreTargetAsmInfo::XCoreTargetAsmInfo(const XCoreTargetMachine &TM) TLSDataSection = DataSection; TLSBSSSection = BSSSection_; - if (TM.getSubtargetImpl()->isXS1A()) { - ReadOnlySection = getNamedSection("\t.dp.rodata", SectionFlags::None | - SectionFlags::Writeable | - SectionFlags::Small); - } else { - ReadOnlySection = getNamedSection("\t.cp.rodata", SectionFlags::None | - SectionFlags::Small); - } + if (TM.getSubtargetImpl()->isXS1A()) + ReadOnlySection = getNamedSection("\t.dp.rodata", SectionFlags::Writeable); + else + ReadOnlySection = getNamedSection("\t.cp.rodata", SectionFlags::None); Data16bitsDirective = "\t.short\t"; Data32bitsDirective = "\t.long\t"; Data64bitsDirective = 0;