1 files changed, 5 insertions, 33 deletions

diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index 2fbf9ec8054..3fa73a60614 100644
--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -198,14 +198,14 @@ namespace {
       AlignmentIsInBytes = false;    // Alignment is by power of 2.
       ConstantPoolSection = "\t.const\t";
       LCOMMDirective = "\t.lcomm\t";
+      StaticCtorsSection = ".mod_init_func";
+      StaticDtorsSection = ".mod_term_func";
     }
 
     virtual const char *getPassName() const {
       return "Darwin PPC Assembly Printer";
     }
     
-    void EmitXXStructorList(Constant *List);
-
     bool runOnMachineFunction(MachineFunction &F);
     bool doInitialization(Module &M);
     bool doFinalization(Module &M);
@@ -415,21 +415,6 @@ bool DarwinAsmPrinter::doInitialization(Module &M) {
   return false;
 }
 
-/// EmitXXStructorList - Emit the ctor or dtor list.  On darwin, this just 
-/// prints out the function pointers.
-void DarwinAsmPrinter::EmitXXStructorList(Constant *List) {
-  // Should be an array of '{ int, void ()* }' structs.  The first value is the
-  // init priority, which we ignore.
-  if (!isa<ConstantArray>(List)) return;
-  ConstantArray *InitList = cast<ConstantArray>(List);
-  for (unsigned i = 0, e = InitList->getNumOperands(); i != e; ++i)
-    if (ConstantStruct *CS = dyn_cast<ConstantStruct>(InitList->getOperand(i))){
-      if (CS->getNumOperands() != 2) return;  // Not array of 2-element structs.
-      // Emit the function pointer.
-      EmitGlobalConstant(CS->getOperand(1));
-    }
-}
-
 bool DarwinAsmPrinter::doFinalization(Module &M) {
   const TargetData &TD = TM.getTargetData();
 
@@ -438,22 +423,9 @@ bool DarwinAsmPrinter::doFinalization(Module &M) {
        I != E; ++I) {
     if (!I->hasInitializer()) continue;   // External global require no code
     
-    // Check to see if this is a special global used by LLVM.
-    if (I->hasAppendingLinkage()) {
-      if (I->getName() == "llvm.used")
-        continue;  // No need to emit this at all.
-      if (I->getName() == "llvm.global_ctors") {
-        SwitchSection(".mod_init_func", 0);
-        EmitAlignment(2, 0);
-        EmitXXStructorList(I->getInitializer());
-        continue;
-      } else if (I->getName() == "llvm.global_dtors") {
-        SwitchSection(".mod_term_func", 0);
-        EmitAlignment(2, 0);
-        EmitXXStructorList(I->getInitializer());
-        continue;
-      }
-    }
+    // Check to see if this is a special global used by LLVM, if so, emit it.
+    if (I->hasAppendingLinkage() && EmitSpecialLLVMGlobal(I))
+      continue;
     
     O << '\n';
     std::string name = Mang->getValueName(I);