commit 1c3792478d45063589e36f0523c66d4b2ec4a90f
author Chris Lattner <sabre@nondot.org> Sun Jul 26 06:48:26 2009 +0000
committer Chris Lattner <sabre@nondot.org> Sun Jul 26 06:48:26 2009 +0000
tree 70a6d27296a89aa26c8b16e6c5057c3b3fc7fed4
parent 47399189c836d255a0b402a0ed5c36d775de5511

rename Mergable -> Mergeable and Writable -> Writeable


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77138 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/ELFTargetAsmInfo.cpp

diff --git a/lib/Target/ELFTargetAsmInfo.cpp b/lib/Target/ELFTargetAsmInfo.cpp
index 5d8d720..258542c 100644
--- a/lib/Target/ELFTargetAsmInfo.cpp
+++ b/lib/Target/ELFTargetAsmInfo.cpp
@@ -44,11 +44,11 @@
   DataRelROLocalSection = getNamedSection("\t.data.rel.ro.local",
                                           SectionFlags::Writable);
     
-  MergableConst4Section = getNamedSection(".rodata.cst4",
+  MergeableConst4Section = getNamedSection(".rodata.cst4",
                   SectionFlags::setEntitySize(SectionFlags::Mergeable, 4));
-  MergableConst8Section = getNamedSection(".rodata.cst8",
+  MergeableConst8Section = getNamedSection(".rodata.cst8",
                   SectionFlags::setEntitySize(SectionFlags::Mergeable, 8));
-  MergableConst16Section = getNamedSection(".rodata.cst16",
+  MergeableConst16Section = getNamedSection(".rodata.cst16",
                   SectionFlags::setEntitySize(SectionFlags::Mergeable, 16));
 }
 
@@ -57,16 +57,16 @@
 ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
                                          SectionKind Kind) const {
   if (Kind.isText()) return TextSection;
-  if (Kind.isMergableCString())
+  if (Kind.isMergeableCString())
     return MergeableStringSection(cast<GlobalVariable>(GV));
   
-  if (Kind.isMergableConst()) {
-    if (Kind.isMergableConst4())
-      return MergableConst4Section;
-    if (Kind.isMergableConst8())
-      return MergableConst8Section;
-    if (Kind.isMergableConst16())
-      return MergableConst16Section;
+  if (Kind.isMergeableConst()) {
+    if (Kind.isMergeableConst4())
+      return MergeableConst4Section;
+    if (Kind.isMergeableConst8())
+      return MergeableConst8Section;
+    if (Kind.isMergeableConst16())
+      return MergeableConst16Section;
     return ReadOnlySection;  // .const
   }
   
@@ -88,11 +88,11 @@
   return DataRelROSection;
 }
 
-/// getSectionForMergableConstant - Given a mergable constant with the
+/// getSectionForMergeableConstant - Given a Mergeable constant with the
 /// specified size and relocation information, return a section that it
 /// should be placed in.
 const Section *
-ELFTargetAsmInfo::getSectionForMergableConstant(SectionKind Kind) const {
+ELFTargetAsmInfo::getSectionForMergeableConstant(SectionKind Kind) const {
   return SelectSectionForGlobal(0, Kind);
 }