Fix several bugs in named sections handling
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53312 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/X86TargetAsmInfo.cpp b/lib/Target/X86/X86TargetAsmInfo.cpp
index 6a3bdfa..7a56ed5 100644
--- a/lib/Target/X86/X86TargetAsmInfo.cpp
+++ b/lib/Target/X86/X86TargetAsmInfo.cpp
@@ -336,9 +336,9 @@
bool is64Bit = X86TM->getSubtarget<X86Subtarget>().is64Bit();
ReadOnlySection = ".rodata";
- FourByteConstantSection = ".rodata.cst";
- EightByteConstantSection = ".rodata.cst";
- SixteenByteConstantSection = ".rodata.cst";
+ FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\",@progbits,4";
+ EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\",@progbits,8";
+ SixteenByteConstantSection = "\t.section\t.rodata.cst16,\"aM\",@progbits,16";
CStringSection = ".rodata.str";
PrivateGlobalPrefix = ".L";
WeakRefDirective = "\t.weak\t";
@@ -466,12 +466,10 @@
unsigned Size = SectionFlags::getEntitySize(Flags);
// FIXME: string here is temporary, until stuff will fully land in.
- if (Size == 4)
- return FourByteConstantSection;
- else if (Size == 8)
- return EightByteConstantSection;
- else if (Size == 16)
- return SixteenByteConstantSection;
+ // We cannot use {Four,Eight,Sixteen}ByteConstantSection here, since it's
+ // currently directly used by asmprinter.
+ if (Size == 4 || Size == 8 || Size == 16)
+ return ".rodata.cst" + utostr(Size);
return getReadOnlySection();
}
@@ -525,8 +523,8 @@
// Mark section as named, when needed (so, we we will need .section directive
// to switch into it).
- if (Flags & (SectionFlags::Mergeable ||
- SectionFlags::TLS ||
+ if (Flags & (SectionFlags::Mergeable |
+ SectionFlags::TLS |
SectionFlags::Linkonce))
Flags |= SectionFlags::Named;