commit 8a4995e42a0fb98dfc971f1f24f1bfd88cb59e70
author Chris Lattner <sabre@nondot.org> Mon Nov 21 06:51:52 2005 +0000
committer Chris Lattner <sabre@nondot.org> Mon Nov 21 06:51:52 2005 +0000
tree f3067f986573bd141064e19e7ac29f7317283cdf
parent 41cb115afbdeee87945a0f2967943104b46cfed9

Start using PrivateGlobalPrefix correctly

llvm-svn: 24442

llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp

diff --git a/llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp b/llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp
index 9581c0c..e902b2d 100644
--- a/llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp
+++ b/llvm/lib/Target/Alpha/AlphaAsmPrinter.cpp
@@ -43,6 +43,7 @@
        : AsmPrinter(o, tm), LabelNumber(0)
     {
       AlignmentIsInBytes = false;
+      PrivateGlobalPrefix = "$";
     }
 
     /// We name each basic block in a Function with a unique number, so
@@ -131,7 +132,8 @@
   }
 
   case MachineOperand::MO_ConstantPoolIndex:
-    O << "$CPI" << CurrentFnName << "_" << MO.getConstantPoolIndex();
+    O << PrivateGlobalPrefix << "CPI" << CurrentFnName << "_"
+      << MO.getConstantPoolIndex();
     return;
 
   case MachineOperand::MO_ExternalSymbol:
@@ -222,8 +224,8 @@
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     //    SwitchSection(O, "section .rodata, \"dr\"");
     emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType()));
-    O << "$CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentString
-      << *CP[i] << "\n";
+    O << PrivateGlobalPrefix << "CPI" << CurrentFnName << "_" << i 
+      << ":\t\t\t\t\t" << CommentString << *CP[i] << "\n";
     emitGlobalConstant(CP[i]);
   }
 }

llvm/lib/Target/IA64/IA64AsmPrinter.cpp

diff --git a/llvm/lib/Target/IA64/IA64AsmPrinter.cpp b/llvm/lib/Target/IA64/IA64AsmPrinter.cpp
index d96a10a..b024a0f 100644
--- a/llvm/lib/Target/IA64/IA64AsmPrinter.cpp
+++ b/llvm/lib/Target/IA64/IA64AsmPrinter.cpp
@@ -88,8 +88,8 @@
       // FIXME: would be nice to have rodata (no 'w') when appropriate?
   for (unsigned i = 0, e = CP.size(); i != e; ++i) {
     emitAlignment(TD.getTypeAlignmentShift(CP[i]->getType()));
-    O << ".CPI" << CurrentFnName << "_" << i << ":\t\t\t\t\t" << CommentString
-      << *CP[i] << "\n";
+    O << PrivateGlobalPrefix << "CPI" << CurrentFnName << "_" << i
+      << ":\t\t\t\t\t" << CommentString << *CP[i] << "\n";
     emitGlobalConstant(CP[i]);
   }
 }
@@ -357,7 +357,7 @@
     return;
 
   case MachineOperand::MO_ConstantPoolIndex: {
-    O << "@gprel(.CPI" << CurrentFnName << "_"
+    O << "@gprel(" << PrivateGlobalPrefix << "CPI" << CurrentFnName << "_"
       << MO.getConstantPoolIndex() << ")";
     return;
   }