From e1abeb478ad0781f5749ac8fce991a04e90d3b25 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 21 Jul 2009 22:25:52 +0000 Subject: [PATCH] Remove the XCore custom implementation of MergeableConstSection, relying on the generic ELF version instead. This will result in its mergable constant sections getting named ".rodata.cst4" instead of ".cp.const4", but the linker looks at the section flags, not the name of the section AFAICT. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76659 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/XCore/XCoreTargetAsmInfo.cpp | 17 ----------------- lib/Target/XCore/XCoreTargetAsmInfo.h | 1 - 2 files changed, 18 deletions(-) diff --git a/lib/Target/XCore/XCoreTargetAsmInfo.cpp b/lib/Target/XCore/XCoreTargetAsmInfo.cpp index 3d2203d6bb2..6c613ef1665 100644 --- a/lib/Target/XCore/XCoreTargetAsmInfo.cpp +++ b/lib/Target/XCore/XCoreTargetAsmInfo.cpp @@ -89,23 +89,6 @@ XCoreTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const { return ELFTargetAsmInfo::SelectSectionForGlobal(GV); } -const Section* -XCoreTargetAsmInfo::MergeableConstSection(const Type *Ty) const { - const TargetData *TD = TM.getTargetData(); - - unsigned Size = TD->getTypeAllocSize(Ty); - if (Size == 4 || Size == 8 || Size == 16) { - std::string Name = ".cp.const" + utostr(Size); - - return getNamedSection(Name.c_str(), - SectionFlags::setEntitySize(SectionFlags::Mergeable | - SectionFlags::Small, - Size)); - } - - return getReadOnlySection(); -} - unsigned XCoreTargetAsmInfo:: SectionFlagsForGlobal(const GlobalValue *GV, const char* Name) const { unsigned Flags = ELFTargetAsmInfo::SectionFlagsForGlobal(GV, Name); diff --git a/lib/Target/XCore/XCoreTargetAsmInfo.h b/lib/Target/XCore/XCoreTargetAsmInfo.h index a1e11fe7868..3582effa901 100644 --- a/lib/Target/XCore/XCoreTargetAsmInfo.h +++ b/lib/Target/XCore/XCoreTargetAsmInfo.h @@ -29,7 +29,6 @@ namespace llvm { explicit XCoreTargetAsmInfo(const XCoreTargetMachine &TM); virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const; - const Section* MergeableConstSection(const Type *Ty) const; virtual unsigned SectionFlagsForGlobal(const GlobalValue *GV = NULL, const char* name = NULL) const; -- 2.34.1