Whitespace cleanup. Remove trailing whitespace.
[oota-llvm.git] / lib / Target / TargetLoweringObjectFile.cpp
index 730d32f5429b9748f3389353b2a3a9204d64b457..c209a7b320af97148360890495cfcb1223647589 100644 (file)
 #include "llvm/DerivedTypes.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/MC/MCContext.h"
-#include "llvm/MC/MCSection.h"
-#include "llvm/Target/TargetMachine.h"
+#include "llvm/MC/MCSectionMachO.h"
+#include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/TargetData.h"
+#include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Support/Mangler.h"
 #include "llvm/ADT/StringExtras.h"
@@ -110,13 +111,16 @@ static bool IsNullTerminatedString(const Constant *C) {
   return false;
 }
 
-/// SectionKindForGlobal - This is a top-level target-independent classifier for
+/// getKindForGlobal - This is a top-level target-independent classifier for
 /// a global variable.  Given an global variable and information from TM, it
 /// classifies the global in a variety of ways that make various target
 /// implementations simpler.  The target implementation is free to ignore this
 /// extra info of course.
-static SectionKind SectionKindForGlobal(const GlobalValue *GV,
-                                        const TargetMachine &TM) {
+SectionKind TargetLoweringObjectFile::getKindForGlobal(const GlobalValue *GV,
+                                                       const TargetMachine &TM){
+  assert(!GV->isDeclaration() && !GV->hasAvailableExternallyLinkage() &&
+         "Can only be used for global definitions");
+  
   Reloc::Model ReloModel = TM.getRelocationModel();
   
   // Early exit - functions should be always in text sections.
@@ -227,33 +231,18 @@ static SectionKind SectionKindForGlobal(const GlobalValue *GV,
 /// the specified global variable or function definition.  This should not
 /// be passed external (or available externally) globals.
 const MCSection *TargetLoweringObjectFile::
-SectionForGlobal(const GlobalValue *GV, Mangler *Mang,
+SectionForGlobal(const GlobalValue *GV, SectionKind Kind, Mangler *Mang,
                  const TargetMachine &TM) const {
-  assert(!GV->isDeclaration() && !GV->hasAvailableExternallyLinkage() &&
-         "Can only be used for global definitions");
-  
-  SectionKind Kind = SectionKindForGlobal(GV, TM);
-  
   // Select section name.
-  if (GV->hasSection()) {
-    // If the target has special section hacks for specifically named globals,
-    // return them now.
-    if (const MCSection *TS = getSpecialCasedSectionGlobals(GV, Mang, Kind))
-      return TS;
-    
-    // If the target has magic semantics for certain section names, make sure to
-    // pick up the flags.  This allows the user to write things with attribute
-    // section and still get the appropriate section flags printed.
-    Kind = getKindForNamedSection(GV->getSection().c_str(), Kind);
-    
-    return getOrCreateSection(GV->getSection().c_str(), false, Kind);
-  }
-
+  if (GV->hasSection())
+    return getExplicitSectionGlobal(GV, Kind, Mang, TM);
+  
   
   // Use default section depending on the 'type' of global
   return SelectSectionForGlobal(GV, Kind, Mang, TM);
 }
 
+
 // Lame default implementation. Calculate the section name for global.
 const MCSection *
 TargetLoweringObjectFile::SelectSectionForGlobal(const GlobalValue *GV,
@@ -286,64 +275,63 @@ TargetLoweringObjectFile::getSectionForConstant(SectionKind Kind) const {
 }
 
 
-const MCSection *TargetLoweringObjectFile::
-getOrCreateSection(const char *Name, bool isDirective, SectionKind Kind) const {
-  if (MCSection *S = Ctx->GetSection(Name))
-    return S;
-  return MCSection::Create(Name, isDirective, Kind, *Ctx);
-}
-
-
 
 //===----------------------------------------------------------------------===//
 //                                  ELF
 //===----------------------------------------------------------------------===//
 
+const MCSection *TargetLoweringObjectFileELF::
+getELFSection(const char *Name, bool isDirective, SectionKind Kind) const {
+  if (MCSection *S = getContext().GetSection(Name))
+    return S;
+  return MCSectionELF::Create(Name, isDirective, Kind, getContext());
+}
+
 void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx,
                                              const TargetMachine &TM) {
   TargetLoweringObjectFile::Initialize(Ctx, TM);
   if (!HasCrazyBSS)
-    BSSSection = getOrCreateSection("\t.bss", true, SectionKind::getBSS());
+    BSSSection = getELFSection("\t.bss", true, SectionKind::getBSS());
   else
     // PPC/Linux doesn't support the .bss directive, it needs .section .bss.
     // FIXME: Does .section .bss work everywhere??
     // FIXME2: this should just be handle by the section printer.  We should get
     // away from syntactic view of the sections and MCSection should just be a
     // semantic view.
-    BSSSection = getOrCreateSection("\t.bss", false, SectionKind::getBSS());
+    BSSSection = getELFSection("\t.bss", false, SectionKind::getBSS());
 
     
-  TextSection = getOrCreateSection("\t.text", true, SectionKind::getText());
-  DataSection = getOrCreateSection("\t.data", true, SectionKind::getDataRel());
+  TextSection = getELFSection("\t.text", true, SectionKind::getText());
+  DataSection = getELFSection("\t.data", true, SectionKind::getDataRel());
   ReadOnlySection =
-    getOrCreateSection("\t.rodata", false, SectionKind::getReadOnly());
+    getELFSection("\t.rodata", false, SectionKind::getReadOnly());
   TLSDataSection =
-    getOrCreateSection("\t.tdata", false, SectionKind::getThreadData());
+    getELFSection("\t.tdata", false, SectionKind::getThreadData());
   
-  TLSBSSSection = getOrCreateSection("\t.tbss", false, 
+  TLSBSSSection = getELFSection("\t.tbss", false, 
                                      SectionKind::getThreadBSS());
 
-  DataRelSection = getOrCreateSection("\t.data.rel", false,
+  DataRelSection = getELFSection("\t.data.rel", false,
                                       SectionKind::getDataRel());
-  DataRelLocalSection = getOrCreateSection("\t.data.rel.local", false,
+  DataRelLocalSection = getELFSection("\t.data.rel.local", false,
                                    SectionKind::getDataRelLocal());
-  DataRelROSection = getOrCreateSection("\t.data.rel.ro", false,
+  DataRelROSection = getELFSection("\t.data.rel.ro", false,
                                 SectionKind::getReadOnlyWithRel());
   DataRelROLocalSection =
-    getOrCreateSection("\t.data.rel.ro.local", false,
+    getELFSection("\t.data.rel.ro.local", false,
                        SectionKind::getReadOnlyWithRelLocal());
     
-  MergeableConst4Section = getOrCreateSection(".rodata.cst4", false,
+  MergeableConst4Section = getELFSection(".rodata.cst4", false,
                                 SectionKind::getMergeableConst4());
-  MergeableConst8Section = getOrCreateSection(".rodata.cst8", false,
+  MergeableConst8Section = getELFSection(".rodata.cst8", false,
                                 SectionKind::getMergeableConst8());
-  MergeableConst16Section = getOrCreateSection(".rodata.cst16", false,
+  MergeableConst16Section = getELFSection(".rodata.cst16", false,
                                SectionKind::getMergeableConst16());
 
   StaticCtorSection =
-    getOrCreateSection(".ctors", false, SectionKind::getDataRel());
+    getELFSection(".ctors", false, SectionKind::getDataRel());
   StaticDtorSection =
-    getOrCreateSection(".dtors", false, SectionKind::getDataRel());
+    getELFSection(".dtors", false, SectionKind::getDataRel());
   
   // Exception Handling Sections.
   
@@ -352,38 +340,38 @@ void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx,
   // runtime hit for C++ apps.  Either the contents of the LSDA need to be
   // adjusted or this should be a data section.
   LSDASection =
-    getOrCreateSection(".gcc_except_table", false, SectionKind::getReadOnly());
+    getELFSection(".gcc_except_table", false, SectionKind::getReadOnly());
   EHFrameSection =
-    getOrCreateSection(".eh_frame", false, SectionKind::getDataRel());
+    getELFSection(".eh_frame", false, SectionKind::getDataRel());
   
   // Debug Info Sections.
   DwarfAbbrevSection = 
-    getOrCreateSection(".debug_abbrev", false, SectionKind::getMetadata());
+    getELFSection(".debug_abbrev", false, SectionKind::getMetadata());
   DwarfInfoSection = 
-    getOrCreateSection(".debug_info", false, SectionKind::getMetadata());
+    getELFSection(".debug_info", false, SectionKind::getMetadata());
   DwarfLineSection = 
-    getOrCreateSection(".debug_line", false, SectionKind::getMetadata());
+    getELFSection(".debug_line", false, SectionKind::getMetadata());
   DwarfFrameSection = 
-    getOrCreateSection(".debug_frame", false, SectionKind::getMetadata());
+    getELFSection(".debug_frame", false, SectionKind::getMetadata());
   DwarfPubNamesSection = 
-    getOrCreateSection(".debug_pubnames", false, SectionKind::getMetadata());
+    getELFSection(".debug_pubnames", false, SectionKind::getMetadata());
   DwarfPubTypesSection = 
-    getOrCreateSection(".debug_pubtypes", false, SectionKind::getMetadata());
+    getELFSection(".debug_pubtypes", false, SectionKind::getMetadata());
   DwarfStrSection = 
-    getOrCreateSection(".debug_str", false, SectionKind::getMetadata());
+    getELFSection(".debug_str", false, SectionKind::getMetadata());
   DwarfLocSection = 
-    getOrCreateSection(".debug_loc", false, SectionKind::getMetadata());
+    getELFSection(".debug_loc", false, SectionKind::getMetadata());
   DwarfARangesSection = 
-    getOrCreateSection(".debug_aranges", false, SectionKind::getMetadata());
+    getELFSection(".debug_aranges", false, SectionKind::getMetadata());
   DwarfRangesSection = 
-    getOrCreateSection(".debug_ranges", false, SectionKind::getMetadata());
+    getELFSection(".debug_ranges", false, SectionKind::getMetadata());
   DwarfMacroInfoSection = 
-    getOrCreateSection(".debug_macinfo", false, SectionKind::getMetadata());
+    getELFSection(".debug_macinfo", false, SectionKind::getMetadata());
 }
 
 
-SectionKind TargetLoweringObjectFileELF::
-getKindForNamedSection(const char *Name, SectionKind K) const {
+static SectionKind 
+getELFKindForNamedSection(const char *Name, SectionKind K) {
   if (Name[0] != '.') return K;
   
   // Some lame default implementation based on some magic section names.
@@ -408,71 +396,15 @@ getKindForNamedSection(const char *Name, SectionKind K) const {
   return K;
 }
 
-void TargetLoweringObjectFileELF::
-getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl<char> &Str) const {
-  Str.push_back(',');
-  Str.push_back('"');
-  
-  if (!Kind.isMetadata())
-    Str.push_back('a');
-  if (Kind.isText())
-    Str.push_back('x');
-  if (Kind.isWriteable())
-    Str.push_back('w');
-  if (Kind.isMergeable1ByteCString() ||
-      Kind.isMergeable2ByteCString() ||
-      Kind.isMergeable4ByteCString() ||
-      Kind.isMergeableConst4() ||
-      Kind.isMergeableConst8() ||
-      Kind.isMergeableConst16())
-    Str.push_back('M');
-  if (Kind.isMergeable1ByteCString() ||
-      Kind.isMergeable2ByteCString() ||
-      Kind.isMergeable4ByteCString())
-    Str.push_back('S');
-  if (Kind.isThreadLocal())
-    Str.push_back('T');
-  
-  Str.push_back('"');
-  Str.push_back(',');
-  
-  // If comment string is '@', e.g. as on ARM - use '%' instead
-  if (AtIsCommentChar)
-    Str.push_back('%');
-  else
-    Str.push_back('@');
+const MCSection *TargetLoweringObjectFileELF::
+getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, 
+                         Mangler *Mang, const TargetMachine &TM) const {
+  // Infer section flags from the section name if we can.
+  Kind = getELFKindForNamedSection(GV->getSection().c_str(), Kind);
   
-  const char *KindStr;
-  if (Kind.isBSS() || Kind.isThreadBSS())
-    KindStr = "nobits";
-  else
-    KindStr = "progbits";
-  
-  Str.append(KindStr, KindStr+strlen(KindStr));
-  
-  if (Kind.isMergeable1ByteCString()) {
-    Str.push_back(',');
-    Str.push_back('1');
-  } else if (Kind.isMergeable2ByteCString()) {
-    Str.push_back(',');
-    Str.push_back('2');
-  } else if (Kind.isMergeable4ByteCString()) {
-    Str.push_back(',');
-    Str.push_back('4');
-  } else if (Kind.isMergeableConst4()) {
-    Str.push_back(',');
-    Str.push_back('4');
-  } else if (Kind.isMergeableConst8()) {
-    Str.push_back(',');
-    Str.push_back('8');
-  } else if (Kind.isMergeableConst16()) {
-    Str.push_back(',');
-    Str.push_back('1');
-    Str.push_back('6');
-  }
+  return getELFSection(GV->getSection().c_str(), false, Kind);
 }
 
-
 static const char *getSectionPrefixForUniqueGlobal(SectionKind Kind) {
   if (Kind.isText())                 return ".gnu.linkonce.t.";
   if (Kind.isReadOnly())             return ".gnu.linkonce.r.";
@@ -499,7 +431,7 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
   if (GV->isWeakForLinker()) {
     const char *Prefix = getSectionPrefixForUniqueGlobal(Kind);
     std::string Name = Mang->makeNameProper(GV->getNameStr());
-    return getOrCreateSection((Prefix+Name).c_str(), false, Kind);
+    return getELFSection((Prefix+Name).c_str(), false, Kind);
   }
   
   if (Kind.isText()) return TextSection;
@@ -524,7 +456,7 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
     
     
     std::string Name = SizeSpec + utostr(Align);
-    return getOrCreateSection(Name.c_str(), false, Kind);
+    return getELFSection(Name.c_str(), false, Kind);
   }
   
   if (Kind.isMergeableConst()) {
@@ -576,115 +508,178 @@ getSectionForConstant(SectionKind Kind) const {
 //                                 MachO
 //===----------------------------------------------------------------------===//
 
+
 const MCSection *TargetLoweringObjectFileMachO::
-getMachOSection(const char *Name, bool isDirective, SectionKind K) {
-  // FOR NOW, Just forward.
-  return getOrCreateSection(Name, isDirective, K);  
+getMachOSection(StringRef Segment, StringRef Section,
+                unsigned TypeAndAttributes,
+                unsigned Reserved2, SectionKind Kind) const {
+  // FIXME: UNIQUE HERE.
+  //if (MCSection *S = getContext().GetSection(Name))
+  //  return S;
+  
+  return MCSectionMachO::Create(Segment, Section, TypeAndAttributes, Reserved2,
+                                Kind, getContext());
 }
 
 
-
 void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx,
                                                const TargetMachine &TM) {
   TargetLoweringObjectFile::Initialize(Ctx, TM);
-  TextSection = getOrCreateSection("\t.text", true,
-                                   SectionKind::getText());
-  DataSection = getOrCreateSection("\t.data", true, 
-                                   SectionKind::getDataRel());
-  
-  CStringSection = getOrCreateSection("\t.cstring", true,
-                               SectionKind::getMergeable1ByteCString());
-  FourByteConstantSection = getOrCreateSection("\t.literal4\n", true,
-                                SectionKind::getMergeableConst4());
-  EightByteConstantSection = getOrCreateSection("\t.literal8\n", true,
-                                SectionKind::getMergeableConst8());
+  
+  TextSection // .text
+    = getMachOSection("__TEXT", "__text",
+                      MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+                      SectionKind::getText());
+  DataSection // .data
+    = getMachOSection("__DATA", "__data", 0, SectionKind::getDataRel());
+  
+  CStringSection // .cstring
+    = getMachOSection("__TEXT", "__cstring", MCSectionMachO::S_CSTRING_LITERALS,
+                      SectionKind::getMergeable1ByteCString());
+  UStringSection
+    = getMachOSection("__TEXT","__ustring", 0,
+                      SectionKind::getMergeable2ByteCString());
+  FourByteConstantSection // .literal4
+    = getMachOSection("__TEXT", "__literal4", MCSectionMachO::S_4BYTE_LITERALS,
+                      SectionKind::getMergeableConst4());
+  EightByteConstantSection // .literal8
+    = getMachOSection("__TEXT", "__literal8", MCSectionMachO::S_8BYTE_LITERALS,
+                      SectionKind::getMergeableConst8());
   
   // ld_classic doesn't support .literal16 in 32-bit mode, and ld64 falls back
   // to using it in -static mode.
+  SixteenByteConstantSection = 0;
   if (TM.getRelocationModel() != Reloc::Static &&
       TM.getTargetData()->getPointerSize() == 32)
-    SixteenByteConstantSection = 
-      getOrCreateSection("\t.literal16\n", true, 
-                         SectionKind::getMergeableConst16());
-  else
-    SixteenByteConstantSection = 0;
-  
-  ReadOnlySection = getOrCreateSection("\t.const", true, 
-                                       SectionKind::getReadOnly());
-  
-  TextCoalSection =
-  getOrCreateSection("\t__TEXT,__textcoal_nt,coalesced,pure_instructions",
-                     false, SectionKind::getText());
-  ConstTextCoalSection = getOrCreateSection("\t__TEXT,__const_coal,coalesced",
-                                            false,
-                                           SectionKind::getText());
-  ConstDataCoalSection = getOrCreateSection("\t__DATA,__const_coal,coalesced",
-                                            false, 
-                                          SectionKind::getText());
-  ConstDataSection = getOrCreateSection("\t.const_data", true,
-                                SectionKind::getReadOnlyWithRel());
-  DataCoalSection = getOrCreateSection("\t__DATA,__datacoal_nt,coalesced",
-                                       false,
-                                       SectionKind::getDataRel());
+    SixteenByteConstantSection =   // .literal16
+      getMachOSection("__TEXT", "__literal16",MCSectionMachO::S_16BYTE_LITERALS,
+                      SectionKind::getMergeableConst16());
+  
+  ReadOnlySection  // .const
+    = getMachOSection("__TEXT", "__const", 0, SectionKind::getReadOnly());
+  
+  TextCoalSection
+    = getMachOSection("__TEXT", "__textcoal_nt",
+                      MCSectionMachO::S_COALESCED |
+                      MCSectionMachO::S_ATTR_PURE_INSTRUCTIONS,
+                      SectionKind::getText());
+  ConstTextCoalSection
+    = getMachOSection("__TEXT", "__const_coal", MCSectionMachO::S_COALESCED,
+                      SectionKind::getText());
+  ConstDataCoalSection
+    = getMachOSection("__DATA","__const_coal", MCSectionMachO::S_COALESCED,
+                      SectionKind::getText());
+  ConstDataSection  // .const_data
+    = getMachOSection("__DATA", "__const", 0,
+                      SectionKind::getReadOnlyWithRel());
+  DataCoalSection
+    = getMachOSection("__DATA","__datacoal_nt", MCSectionMachO::S_COALESCED,
+                      SectionKind::getDataRel());
 
   if (TM.getRelocationModel() == Reloc::Static) {
-    StaticCtorSection =
-      getOrCreateSection(".constructor", true, SectionKind::getDataRel());
-    StaticDtorSection =
-      getOrCreateSection(".destructor", true, SectionKind::getDataRel());
+    StaticCtorSection
+      = getMachOSection("__TEXT", "__constructor", 0,SectionKind::getDataRel());
+    StaticDtorSection
+      = getMachOSection("__TEXT", "__destructor", 0, SectionKind::getDataRel());
   } else {
-    StaticCtorSection =
-      getOrCreateSection(".mod_init_func", true, SectionKind::getDataRel());
-    StaticDtorSection =
-      getOrCreateSection(".mod_term_func", true, SectionKind::getDataRel());
+    StaticCtorSection
+      = getMachOSection("__DATA", "__mod_init_func",
+                        MCSectionMachO::S_MOD_INIT_FUNC_POINTERS,
+                        SectionKind::getDataRel());
+    StaticDtorSection
+      = getMachOSection("__DATA", "__mod_term_func", 
+                        MCSectionMachO::S_MOD_TERM_FUNC_POINTERS,
+                        SectionKind::getDataRel());
   }
   
   // Exception Handling.
-  LSDASection = getOrCreateSection("__DATA,__gcc_except_tab", false,
-                                   SectionKind::getDataRel());
+  LSDASection = getMachOSection("__DATA", "__gcc_except_tab", 0,
+                                SectionKind::getDataRel());
   EHFrameSection =
-    getOrCreateSection("__TEXT,__eh_frame,coalesced,no_toc+strip_static_syms"
-                       "+live_support", false, SectionKind::getReadOnly());
+    getMachOSection("__TEXT", "__eh_frame",
+                    MCSectionMachO::S_COALESCED |
+                    MCSectionMachO::S_ATTR_NO_TOC |
+                    MCSectionMachO::S_ATTR_STRIP_STATIC_SYMS |
+                    MCSectionMachO::S_ATTR_LIVE_SUPPORT,
+                    SectionKind::getReadOnly());
 
   // Debug Information.
-  // FIXME: Don't use 'directive' syntax: need flags for debug/regular??
-  // FIXME: Need __DWARF segment.
   DwarfAbbrevSection = 
-    getOrCreateSection(".section __DWARF,__debug_abbrev,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_abbrev", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfInfoSection =  
-    getOrCreateSection(".section __DWARF,__debug_info,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_info", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfLineSection =  
-    getOrCreateSection(".section __DWARF,__debug_line,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_line", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfFrameSection =  
-    getOrCreateSection(".section __DWARF,__debug_frame,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_frame", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfPubNamesSection =  
-    getOrCreateSection(".section __DWARF,__debug_pubnames,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_pubnames", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfPubTypesSection =  
-    getOrCreateSection(".section __DWARF,__debug_pubtypes,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_pubtypes", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfStrSection =  
-    getOrCreateSection(".section __DWARF,__debug_str,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_str", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfLocSection =  
-    getOrCreateSection(".section __DWARF,__debug_loc,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_loc", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfARangesSection =  
-    getOrCreateSection(".section __DWARF,__debug_aranges,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_aranges", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfRangesSection =  
-    getOrCreateSection(".section __DWARF,__debug_ranges,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_ranges", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfMacroInfoSection =  
-    getOrCreateSection(".section __DWARF,__debug_macinfo,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_macinfo", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
   DwarfDebugInlineSection = 
-    getOrCreateSection(".section __DWARF,__debug_inlined,regular,debug", true,
-                       SectionKind::getMetadata());
+    getMachOSection("__DWARF", "__debug_inlined", MCSectionMachO::S_ATTR_DEBUG,
+                    SectionKind::getMetadata());
+}
+
+/// getLazySymbolPointerSection - Return the section corresponding to
+/// the .lazy_symbol_pointer directive.
+const MCSection *TargetLoweringObjectFileMachO::
+getLazySymbolPointerSection() const {
+  return getMachOSection("__DATA", "__la_symbol_ptr",
+                         MCSectionMachO::S_LAZY_SYMBOL_POINTERS,
+                         SectionKind::getMetadata());
+}
+
+/// getNonLazySymbolPointerSection - Return the section corresponding to
+/// the .non_lazy_symbol_pointer directive.
+const MCSection *TargetLoweringObjectFileMachO::
+getNonLazySymbolPointerSection() const {
+  return getMachOSection("__DATA", "__nl_symbol_ptr",
+                         MCSectionMachO::S_NON_LAZY_SYMBOL_POINTERS,
+                         SectionKind::getMetadata());
+}
+
+
+const MCSection *TargetLoweringObjectFileMachO::
+getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, 
+                         Mangler *Mang, const TargetMachine &TM) const {
+  // Parse the section specifier and create it if valid.
+  StringRef Segment, Section;
+  unsigned TAA, StubSize;
+  std::string ErrorCode =
+    MCSectionMachO::ParseSectionSpecifier(GV->getSection(), Segment, Section,
+                                          TAA, StubSize);
+  if (ErrorCode.empty())
+    return getMachOSection(Segment, Section, TAA, StubSize, Kind);
+  
+  
+  // If invalid, report the error with llvm_report_error.
+  llvm_report_error("Global variable '" + GV->getNameStr() +
+                    "' has an invalid section specifier '" + GV->getSection() +
+                    "': " + ErrorCode + ".");
+  // Fall back to dropping it into the data section.
+  return DataSection;
 }
 
 const MCSection *TargetLoweringObjectFileMachO::
@@ -704,18 +699,15 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
   }
   
   // FIXME: Alignment check should be handled by section classifier.
-  if (Kind.isMergeable1ByteCString()) {
-    Constant *C = cast<GlobalVariable>(GV)->getInitializer();
-    const Type *Ty = cast<ArrayType>(C->getType())->getElementType();
-    const TargetData &TD = *TM.getTargetData();
-    unsigned Size = TD.getTypeAllocSize(Ty);
-    if (Size) {
-      unsigned Align = TD.getPreferredAlignment(cast<GlobalVariable>(GV));
-      if (Align <= 32)
+  if (Kind.isMergeable1ByteCString() ||
+      Kind.isMergeable2ByteCString()) {
+    if (TM.getTargetData()->getPreferredAlignment(
+                                              cast<GlobalVariable>(GV)) < 32) {
+      if (Kind.isMergeable1ByteCString())
         return CStringSection;
+      assert(Kind.isMergeable2ByteCString());
+      return UStringSection;
     }
-    
-    return ReadOnlySection;
   }
   
   if (Kind.isMergeableConst()) {
@@ -725,11 +717,10 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
       return EightByteConstantSection;
     if (Kind.isMergeableConst16() && SixteenByteConstantSection)
       return SixteenByteConstantSection;
-    return ReadOnlySection;  // .const
   }
-  
-  // FIXME: ROData -> const in -static mode that is relocatable but they happen
-  // by the static linker.  Why not mergeable?
+
+  // Otherwise, if it is readonly, but not something we can specially optimize,
+  // just drop it in .const.
   if (Kind.isReadOnly())
     return ReadOnlySection;
 
@@ -785,72 +776,66 @@ shouldEmitUsedDirectiveFor(const GlobalValue *GV, Mangler *Mang) const {
 //                                  COFF
 //===----------------------------------------------------------------------===//
 
+
 const MCSection *TargetLoweringObjectFileCOFF::
-getCOFFSection(const char *Name, bool isDirective, SectionKind K) {
-  return getOrCreateSection(Name, isDirective, K);
+getCOFFSection(const char *Name, bool isDirective, SectionKind Kind) const {
+  if (MCSection *S = getContext().GetSection(Name))
+    return S;
+  return MCSectionCOFF::Create(Name, isDirective, Kind, getContext());
 }
 
 void TargetLoweringObjectFileCOFF::Initialize(MCContext &Ctx,
                                               const TargetMachine &TM) {
   TargetLoweringObjectFile::Initialize(Ctx, TM);
-  TextSection = getOrCreateSection("\t.text", true,
-                                   SectionKind::getText());
-  DataSection = getOrCreateSection("\t.data", true,
-                                   SectionKind::getDataRel());
+  TextSection = getCOFFSection("\t.text", true, SectionKind::getText());
+  DataSection = getCOFFSection("\t.data", true, SectionKind::getDataRel());
   StaticCtorSection =
-    getOrCreateSection(".ctors", false, SectionKind::getDataRel());
+    getCOFFSection(".ctors", false, SectionKind::getDataRel());
   StaticDtorSection =
-    getOrCreateSection(".dtors", false, SectionKind::getDataRel());
+    getCOFFSection(".dtors", false, SectionKind::getDataRel());
   
   
   // Debug info.
   // FIXME: Don't use 'directive' mode here.
   DwarfAbbrevSection =  
-    getOrCreateSection("\t.section\t.debug_abbrev,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_abbrev,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfInfoSection =    
-    getOrCreateSection("\t.section\t.debug_info,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_info,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfLineSection =    
-    getOrCreateSection("\t.section\t.debug_line,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_line,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfFrameSection =   
-    getOrCreateSection("\t.section\t.debug_frame,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_frame,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfPubNamesSection =
-    getOrCreateSection("\t.section\t.debug_pubnames,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_pubnames,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfPubTypesSection =
-    getOrCreateSection("\t.section\t.debug_pubtypes,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_pubtypes,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfStrSection =     
-    getOrCreateSection("\t.section\t.debug_str,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_str,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfLocSection =     
-    getOrCreateSection("\t.section\t.debug_loc,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_loc,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfARangesSection = 
-    getOrCreateSection("\t.section\t.debug_aranges,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_aranges,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfRangesSection =  
-    getOrCreateSection("\t.section\t.debug_ranges,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_ranges,\"dr\"",
+                   true, SectionKind::getMetadata());
   DwarfMacroInfoSection = 
-    getOrCreateSection("\t.section\t.debug_macinfo,\"dr\"",
-                       true, SectionKind::getMetadata());
+    getCOFFSection("\t.section\t.debug_macinfo,\"dr\"",
+                   true, SectionKind::getMetadata());
 }
 
-void TargetLoweringObjectFileCOFF::
-getSectionFlagsAsString(SectionKind Kind, SmallVectorImpl<char> &Str) const {
-  // FIXME: Inefficient.
-  std::string Res = ",\"";
-  if (Kind.isText())
-    Res += 'x';
-  if (Kind.isWriteable())
-    Res += 'w';
-  Res += "\"";
-  
-  Str.append(Res.begin(), Res.end());
+const MCSection *TargetLoweringObjectFileCOFF::
+getExplicitSectionGlobal(const GlobalValue *GV, SectionKind Kind, 
+                         Mangler *Mang, const TargetMachine &TM) const {
+  return getCOFFSection(GV->getSection().c_str(), false, Kind);
 }
 
 static const char *getCOFFSectionPrefixForUniqueGlobal(SectionKind Kind) {
@@ -872,7 +857,7 @@ SelectSectionForGlobal(const GlobalValue *GV, SectionKind Kind,
   if (GV->isWeakForLinker()) {
     const char *Prefix = getCOFFSectionPrefixForUniqueGlobal(Kind);
     std::string Name = Mang->makeNameProper(GV->getNameStr());
-    return getOrCreateSection((Prefix+Name).c_str(), false, Kind);
+    return getCOFFSection((Prefix+Name).c_str(), false, Kind);
   }
   
   if (Kind.isText())