3 files changed, 4 insertions, 7 deletions
diff --git a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
index 70332a38a23..dd0da7d2e30 100755
--- a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
@@ -32,7 +32,7 @@ bool X86ATTAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
   printConstantPool(MF.getConstantPool());
 
   // Print out labels for the function.
-  O << "\t.text\n";
+  SwitchSection("\t.text\n", MF.getFunction());
   emitAlignment(4);     // FIXME: This should be parameterized somewhere.
   O << "\t.globl\t" << CurrentFnName << "\n";
   if (!forCygwin && !forDarwin)
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
index dc12d87d96b..e0bd0de6c86 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -84,11 +84,7 @@ void X86SharedAsmPrinter::printConstantPool(MachineConstantPool *MCP) {
 
   if (CP.empty()) return;
 
-  if (forDarwin) {
-    O << "\t.const\n";
-  } else {
-    O << "\t.section .rodata\n";
-  }
+  SwitchSection(forDarwin ? "\t.const\n" : "\t.section .rodata\n", 0);
   
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     // FIXME: force doubles to be naturally aligned.  We should handle this
@@ -168,6 +164,7 @@ bool X86SharedAsmPrinter::doFinalization(Module &M) {
     }
 
   if (forDarwin) {
+    SwitchSection("", 0);
     // Output stubs for external global variables
     if (GVStubs.begin() != GVStubs.end())
       O << "\t.non_lazy_symbol_pointer\n";
diff --git a/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp b/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
index a9d7c63ccda..71dc0b2821a 100755
--- a/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
@@ -32,7 +32,7 @@ bool X86IntelAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
   printConstantPool(MF.getConstantPool());
 
   // Print out labels for the function.
-  O << "\t.text\n";
+  SwitchSection("\t.text\n", MF.getFunction());
   emitAlignment(4);
   O << "\t.globl\t" << CurrentFnName << "\n";
   if (!forCygwin && !forDarwin)