From d6896006b1306f7e3945386314dd9377935a62a4 Mon Sep 17 00:00:00 2001 From: Bob Wilson Date: Wed, 30 Sep 2009 22:25:37 +0000 Subject: [PATCH] Use OutStreamer.SwitchSection instead of writing out textual section directives. Add a new TargetLoweringObjectFileMachO::getConstTextCoalSection method to get access to that section. llvm-svn: 83178 --- .../llvm/Target/TargetLoweringObjectFile.h | 8 +++++- lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp | 25 +++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/include/llvm/Target/TargetLoweringObjectFile.h b/include/llvm/Target/TargetLoweringObjectFile.h index 454a0940b97..821e53783c6 100644 --- a/include/llvm/Target/TargetLoweringObjectFile.h +++ b/include/llvm/Target/TargetLoweringObjectFile.h @@ -301,11 +301,17 @@ public: SectionKind K) const; /// getTextCoalSection - Return the "__TEXT,__textcoal_nt" section we put weak - /// symbols into. + /// text symbols into. const MCSection *getTextCoalSection() const { return TextCoalSection; } + /// getConstTextCoalSection - Return the "__TEXT,__const_coal" section + /// we put weak read-only symbols into. + const MCSection *getConstTextCoalSection() const { + return ConstTextCoalSection; + } + /// getLazySymbolPointerSection - Return the section corresponding to /// the .lazy_symbol_pointer directive. const MCSection *getLazySymbolPointerSection() const { diff --git a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp index b496a810b02..5d14a9b4d3f 100644 --- a/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp +++ b/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp @@ -1053,13 +1053,24 @@ void ARMAsmPrinter::EmitStartOfAsmFile(Module &M) { // avoid out-of-range branches that are due a fundamental limitation of // the way symbol offsets are encoded with the current Darwin ARM // relocations. - O << "\t.section __TEXT,__text,regular\n" - << "\t.section __TEXT,__textcoal_nt,coalesced\n" - << "\t.section __TEXT,__const_coal,coalesced\n"; - if (RelocM == Reloc::DynamicNoPIC) - O << "\t.section __TEXT,__symbol_stub4,symbol_stubs,none,12\n"; - else - O << "\t.section __TEXT,__picsymbolstub4,symbol_stubs,none,16\n"; + TargetLoweringObjectFileMachO &TLOFMacho = + static_cast(getObjFileLowering()); + OutStreamer.SwitchSection(TLOFMacho.getTextSection()); + OutStreamer.SwitchSection(TLOFMacho.getTextCoalSection()); + OutStreamer.SwitchSection(TLOFMacho.getConstTextCoalSection()); + if (RelocM == Reloc::DynamicNoPIC) { + const MCSection *sect = + TLOFMacho.getMachOSection("__TEXT", "__symbol_stub4", + MCSectionMachO::S_SYMBOL_STUBS, + 12, SectionKind::getText()); + OutStreamer.SwitchSection(sect); + } else { + const MCSection *sect = + TLOFMacho.getMachOSection("__TEXT", "__picsymbolstub4", + MCSectionMachO::S_SYMBOL_STUBS, + 16, SectionKind::getText()); + OutStreamer.SwitchSection(sect); + } } }