[llvm-commits] [llvm] r76590 - in /llvm/trunk: include/llvm/Target/TargetAsmInfo.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp lib/CodeGen/MachOWriter.cpp lib/Target/DarwinTargetAsmInfo.cpp lib/Target/MSP430/MSP430AsmPrinter.cpp lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp lib/Target/TargetAsmInfo.cpp
Chris Lattner
sabre at nondot.org
Tue Jul 21 10:30:56 PDT 2009
Author: lattner
Date: Tue Jul 21 12:30:51 2009
New Revision: 76590
URL: http://llvm.org/viewvc/llvm-project?rev=76590&view=rev
Log:
Rename LessPrivateGlobalPrefix -> LinkerPrivateGlobalPrefix to match the
LLVM IR concept.
Modified:
llvm/trunk/include/llvm/Target/TargetAsmInfo.h
llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
llvm/trunk/lib/CodeGen/MachOWriter.cpp
llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
llvm/trunk/lib/Target/MSP430/MSP430AsmPrinter.cpp
llvm/trunk/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
llvm/trunk/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
llvm/trunk/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
llvm/trunk/lib/Target/TargetAsmInfo.cpp
Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Tue Jul 21 12:30:51 2009
@@ -239,10 +239,10 @@
/// have names in the .o file. This is often "." or "L".
const char *PrivateGlobalPrefix; // Defaults to "."
- /// LessPrivateGlobalPrefix - This prefix is used for symbols that should
+ /// LinkerPrivateGlobalPrefix - This prefix is used for symbols that should
/// be passed through the assembler but be removed by the linker. This
/// is "l" on Darwin, currently used for some ObjC metadata.
- const char *LessPrivateGlobalPrefix; // Defaults to ""
+ const char *LinkerPrivateGlobalPrefix; // Defaults to ""
/// JumpTableSpecialLabelPrefix - If not null, a extra (dead) label is
/// emitted before jump tables with the specified prefix.
@@ -708,8 +708,8 @@
const char *getPrivateGlobalPrefix() const {
return PrivateGlobalPrefix;
}
- const char *getLessPrivateGlobalPrefix() const {
- return LessPrivateGlobalPrefix;
+ const char *getLinkerPrivateGlobalPrefix() const {
+ return LinkerPrivateGlobalPrefix;
}
const char *getJumpTableSpecialLabelPrefix() const {
return JumpTableSpecialLabelPrefix;
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Tue Jul 21 12:30:51 2009
@@ -155,7 +155,7 @@
bool AsmPrinter::doInitialization(Module &M) {
Mang = new Mangler(M, TAI->getGlobalPrefix(), TAI->getPrivateGlobalPrefix(),
- TAI->getLessPrivateGlobalPrefix());
+ TAI->getLinkerPrivateGlobalPrefix());
if (TAI->doesAllowQuotesInName())
Mang->setUseQuotes(true);
Modified: llvm/trunk/lib/CodeGen/MachOWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachOWriter.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/MachOWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachOWriter.cpp Tue Jul 21 12:30:51 2009
@@ -747,6 +747,7 @@
GV(gv), n_strx(0), n_type(sect == NO_SECT ? N_UNDF : N_SECT), n_sect(sect),
n_desc(0), n_value(0) {
+ // FIXME: This is completely broken, it should use the mangler interface.
switch (GV->getLinkage()) {
default:
llvm_unreachable("Unexpected linkage type!");
@@ -765,7 +766,7 @@
GVName = TAI->getPrivateGlobalPrefix() + name;
break;
case GlobalValue::LinkerPrivateLinkage:
- GVName = TAI->getLessPrivateGlobalPrefix() + name;
+ GVName = TAI->getLinkerPrivateGlobalPrefix() + name;
break;
case GlobalValue::InternalLinkage:
GVName = TAI->getGlobalPrefix() + name;
Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Tue Jul 21 12:30:51 2009
@@ -57,7 +57,7 @@
// Syntax:
GlobalPrefix = "_";
PrivateGlobalPrefix = "L";
- LessPrivateGlobalPrefix = "l"; // Marker for some ObjC metadata
+ LinkerPrivateGlobalPrefix = "l"; // Marker for some ObjC metadata
NeedsSet = true;
NeedsIndirectEncoding = true;
AllowQuotesInName = true;
@@ -105,17 +105,18 @@
}
/// emitUsedDirectiveFor - On Darwin, internally linked data beginning with
-/// the PrivateGlobalPrefix or the LessPrivateGlobalPrefix does not have the
+/// the PrivateGlobalPrefix or the LinkerPrivateGlobalPrefix does not have the
/// directive emitted (this occurs in ObjC metadata).
bool DarwinTargetAsmInfo::emitUsedDirectiveFor(const GlobalValue* GV,
Mangler *Mang) const {
if (!GV) return false;
- // Check whether the mangled name has the "Private" or "LessPrivate" prefix.
+ // Check whether the mangled name has the "Private" or "LinkerPrivate" prefix.
if (GV->hasLocalLinkage() && !isa<Function>(GV)) {
const std::string &Name = Mang->getMangledName(GV);
+ // FIXME: Always "L" and "l", simplify!
const char *PGPrefix = getPrivateGlobalPrefix();
- const char *LPGPrefix = getLessPrivateGlobalPrefix();
+ const char *LPGPrefix = getLinkerPrivateGlobalPrefix();
unsigned PGPLen = strlen(PGPrefix);
unsigned LPGPLen = strlen(LPGPrefix);
Modified: llvm/trunk/lib/Target/MSP430/MSP430AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSP430/MSP430AsmPrinter.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/Target/MSP430/MSP430AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/MSP430/MSP430AsmPrinter.cpp Tue Jul 21 12:30:51 2009
@@ -82,7 +82,7 @@
bool MSP430AsmPrinter::doInitialization(Module &M) {
Mang = new Mangler(M, "", TAI->getPrivateGlobalPrefix(),
- TAI->getLessPrivateGlobalPrefix());
+ TAI->getLinkerPrivateGlobalPrefix());
return false; // success
}
Modified: llvm/trunk/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp Tue Jul 21 12:30:51 2009
@@ -452,7 +452,7 @@
doInitialization(Module &M)
{
Mang = new Mangler(M, "", TAI->getPrivateGlobalPrefix(),
- TAI->getLessPrivateGlobalPrefix());
+ TAI->getLinkerPrivateGlobalPrefix());
// Tell the assembler which ABI we are using
O << "\t.section .mdebug." << emitCurrentABIString() << '\n';
Modified: llvm/trunk/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/AsmPrinter/SparcAsmPrinter.cpp Tue Jul 21 12:30:51 2009
@@ -224,7 +224,7 @@
bool SparcAsmPrinter::doInitialization(Module &M) {
Mang = new Mangler(M, "", TAI->getPrivateGlobalPrefix(),
- TAI->getLessPrivateGlobalPrefix());
+ TAI->getLinkerPrivateGlobalPrefix());
return false; // success
}
Modified: llvm/trunk/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp Tue Jul 21 12:30:51 2009
@@ -93,7 +93,7 @@
bool SystemZAsmPrinter::doInitialization(Module &M) {
Mang = new Mangler(M, "", TAI->getPrivateGlobalPrefix(),
- TAI->getLessPrivateGlobalPrefix());
+ TAI->getLinkerPrivateGlobalPrefix());
return false; // success
}
Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=76590&r1=76589&r2=76590&view=diff
==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Tue Jul 21 12:30:51 2009
@@ -49,7 +49,7 @@
MaxOperandLength = 0;
GlobalPrefix = "";
PrivateGlobalPrefix = ".";
- LessPrivateGlobalPrefix = "";
+ LinkerPrivateGlobalPrefix = "";
JumpTableSpecialLabelPrefix = 0;
GlobalVarAddrPrefix = "";
GlobalVarAddrSuffix = "";
More information about the llvm-commits
mailing list