diff options
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 10 | ||||
| -rw-r--r-- | lib/CodeGen/ELFWriter.cpp | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index d82710fb10..5da01a2250 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -315,14 +315,14 @@ void AsmPrinter::EmitConstantPool(MachineConstantPool *MCP) { case 1: Kind = SectionKind::get(SectionKind::ReadOnlyWithRelLocal); break; case 0: switch (TM.getTargetData()->getTypeAllocSize(CPE.getType())) { - case 4: Kind = SectionKind::get(SectionKind::MergableConst4); break; - case 8: Kind = SectionKind::get(SectionKind::MergableConst8); break; - case 16: Kind = SectionKind::get(SectionKind::MergableConst16); break; - default: Kind = SectionKind::get(SectionKind::MergableConst); break; + case 4: Kind = SectionKind::get(SectionKind::MergeableConst4); break; + case 8: Kind = SectionKind::get(SectionKind::MergeableConst8); break; + case 16: Kind = SectionKind::get(SectionKind::MergeableConst16); break; + default: Kind = SectionKind::get(SectionKind::MergeableConst); break; } } - const Section *S = TAI->getSectionForMergableConstant(Kind); + const Section *S = TAI->getSectionForMergeableConstant(Kind); // The number of sections are small, just do a linear search from the // last section to the first. diff --git a/lib/CodeGen/ELFWriter.cpp b/lib/CodeGen/ELFWriter.cpp index f34f86b4f4..97b7ff0c8d 100644 --- a/lib/CodeGen/ELFWriter.cpp +++ b/lib/CodeGen/ELFWriter.cpp @@ -161,15 +161,14 @@ ELFSection &ELFWriter::getConstantPoolSection(MachineConstantPoolEntry &CPE) { case 1: Kind = SectionKind::get(SectionKind::ReadOnlyWithRelLocal); break; case 0: switch (TM.getTargetData()->getTypeAllocSize(CPE.getType())) { - case 4: Kind = SectionKind::get(SectionKind::MergableConst4); break; - case 8: Kind = SectionKind::get(SectionKind::MergableConst8); break; - case 16: Kind = SectionKind::get(SectionKind::MergableConst16); break; - default: Kind = SectionKind::get(SectionKind::MergableConst); break; + case 4: Kind = SectionKind::get(SectionKind::MergeableConst4); break; + case 8: Kind = SectionKind::get(SectionKind::MergeableConst8); break; + case 16: Kind = SectionKind::get(SectionKind::MergeableConst16); break; + default: Kind = SectionKind::get(SectionKind::MergeableConst); break; } } - std::string CstPoolName = TAI->getSectionForMergableConstant(Kind)->getName(); - return getSection(CstPoolName, + return getSection(TAI->getSectionForMergeableConstant(Kind)->getName(), ELFSection::SHT_PROGBITS, ELFSection::SHF_MERGE | ELFSection::SHF_ALLOC, CPE.getAlignment()); |