- Emit subsections_via_symbols for Darwin.
- Conditionalize Dwarf debugging output (Darwin only for now).
llvm-svn: 26582
diff --git a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
index e50100e..f1b53fd 100755
--- a/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
@@ -27,15 +27,19 @@
/// method to print assembly for each instruction.
///
bool X86ATTAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
- // Let PassManager know we need debug information and relay
- // the MachineDebugInfo address on to DwarfWriter.
- DW.SetDebugInfo(&getAnalysis<MachineDebugInfo>());
+ // if (forDarwin) {
+ // Let PassManager know we need debug information and relay
+ // the MachineDebugInfo address on to DwarfWriter.
+ DW.SetDebugInfo(&getAnalysis<MachineDebugInfo>());
+ // }
SetupMachineFunction(MF);
O << "\n\n";
- // Emit pre-function debug information.
- DW.BeginFunction(MF);
+ if (forDarwin) {
+ // Emit pre-function debug information.
+ DW.BeginFunction(MF);
+ }
// Print out constants referenced by the function
EmitConstantPool(MF.getConstantPool());
@@ -88,8 +92,10 @@
if (HasDotTypeDotSizeDirective)
O << "\t.size " << CurrentFnName << ", .-" << CurrentFnName << "\n";
- // Emit post-function debug information.
- DW.EndFunction(MF);
+ if (forDarwin) {
+ // Emit post-function debug information.
+ DW.EndFunction(MF);
+ }
// We didn't modify anything.
return false;
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
index edc2397..a5e7008 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -75,8 +75,10 @@
default: break;
}
- // Emit initial debug information.
- DW.BeginModule(M);
+ if (forDarwin) {
+ // Emit initial debug information.
+ DW.BeginModule(M);
+ }
return AsmPrinter::doInitialization(M);
}
@@ -188,10 +190,17 @@
O << "\t.indirect_symbol " << *i << "\n";
O << "\t.long\t0\n";
}
- }
- // Emit initial debug information.
- DW.EndModule(M);
+ // Emit initial debug information.
+ DW.EndModule(M);
+
+ // Funny Darwin hack: This flag tells the linker that no global symbols
+ // contain code that falls through to other global symbols (e.g. the obvious
+ // implementation of multiple entry points). If this doesn't occur, the
+ // linker can safely perform dead code stripping. Since LLVM never generates
+ // code that does this, it is always safe to set.
+ O << "\t.subsections_via_symbols\n";
+ }
AsmPrinter::doFinalization(M);
return false; // success
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.h b/llvm/lib/Target/X86/X86AsmPrinter.h
index 5b27c56..ed0fdbe 100755
--- a/llvm/lib/Target/X86/X86AsmPrinter.h
+++ b/llvm/lib/Target/X86/X86AsmPrinter.h
@@ -68,7 +68,7 @@
MachineFunctionPass::getAnalysisUsage(AU);
}
- bool forDarwin; // FIXME: eliminate.
+ bool forDarwin; // FIXME: eliminate.
// Necessary for Darwin to print out the apprioriate types of linker stubs
std::set<std::string> FnStubs, GVStubs, LinkOnceStubs;
diff --git a/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp b/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
index 5bc8b24..a04dfca 100755
--- a/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
@@ -26,15 +26,19 @@
/// method to print assembly for each instruction.
///
bool X86IntelAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
- // Let PassManager know we need debug information and relay
- // the MachineDebugInfo address on to DwarfWriter.
- DW.SetDebugInfo(&getAnalysis<MachineDebugInfo>());
+ if (forDarwin) {
+ // Let PassManager know we need debug information and relay
+ // the MachineDebugInfo address on to DwarfWriter.
+ DW.SetDebugInfo(&getAnalysis<MachineDebugInfo>());
+ }
SetupMachineFunction(MF);
O << "\n\n";
- // Emit pre-function debug information.
- DW.BeginFunction(MF);
+ if (forDarwin) {
+ // Emit pre-function debug information.
+ DW.BeginFunction(MF);
+ }
// Print out constants referenced by the function
EmitConstantPool(MF.getConstantPool());
@@ -63,8 +67,10 @@
}
}
- // Emit post-function debug information.
- DW.EndFunction(MF);
+ if (forDarwin) {
+ // Emit post-function debug information.
+ DW.EndFunction(MF);
+ }
// We didn't modify anything.
return false;