Another bunch of hacks for named sections support
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53315 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86TargetAsmInfo.cpp b/lib/Target/X86/X86TargetAsmInfo.cpp
index a53f4a1..0fdc0ee 100644
--- a/lib/Target/X86/X86TargetAsmInfo.cpp
+++ b/lib/Target/X86/X86TargetAsmInfo.cpp
@@ -323,8 +323,10 @@
Type = C->getType();
unsigned Size = TD->getABITypeSize(Type);
- if (Size > 16) {
- // Too big for mergeable
+ if (Size > 16 ||
+ !(Flags & SectionFlags::Strings ||
+ (Size == 4 || Size == 8 || Size == 16))) {
+ // Not suitable for mergeable
Size = 0;
Flags &= ~SectionFlags::Mergeable;
}
@@ -516,8 +518,12 @@
Type = C->getType();
unsigned Size = TD->getABITypeSize(Type);
- if (Size > 16) {
- // Too big for mergeable
+ // FIXME: size check here ugly, and will hopefully have gone, when we will
+ // have sane interface for attaching flags to sections.
+ if (Size > 16 ||
+ !(Flags & SectionFlags::Strings ||
+ (Size == 4 || Size == 8 || Size == 16))) {
+ // Not suitable for mergeable
Size = 0;
Flags &= ~SectionFlags::Mergeable;
}
@@ -529,9 +535,11 @@
// Mark section as named, when needed (so, we we will need .section directive
// to switch into it).
- if (Flags & (SectionFlags::Mergeable |
- SectionFlags::TLS |
- SectionFlags::Linkonce))
+ unsigned TypeFlags = Flags & SectionFlags::TypeFlags;
+ if (!TypeFlags /* Read-only section */ ||
+ (TypeFlags & (SectionFlags::Mergeable |
+ SectionFlags::TLS |
+ SectionFlags::Linkonce)))
Flags |= SectionFlags::Named;
return Flags;
@@ -668,9 +676,11 @@
// Mark section as named, when needed (so, we we will need .section directive
// to switch into it).
- if (Flags & (SectionFlags::Mergeable ||
- SectionFlags::TLS ||
- SectionFlags::Linkonce))
+ unsigned TypeFlags = Flags & SectionFlags::TypeFlags;
+ if (!TypeFlags /* Read-only section */ ||
+ (TypeFlags & (SectionFlags::Mergeable |
+ SectionFlags::TLS |
+ SectionFlags::Linkonce)))
Flags |= SectionFlags::Named;
return Flags;