replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix uses of the C99 PRI format macros not to conflict with C++11 UDLs. 

llvm-svn: 152474
This commit is contained in:
Benjamin Kramer 2012-03-10 02:04:38 +00:00
parent fd9de90123
commit 82803112da
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/tools/llvm-nm/llvm-nm.cpp
View File

@ -204,7 +204,8 @@ static void SortAndPrintSymbolList() {
strcpy(SymbolSizeStr, " "); strcpy(SymbolSizeStr, " ");
if (i->Address != object::UnknownAddressOrSize) if (i->Address != object::UnknownAddressOrSize)
format("%08"PRIx64, i->Address).print(SymbolAddrStr, sizeof(SymbolAddrStr)); format("%08" PRIx64, i->Address).print(SymbolAddrStr,
sizeof(SymbolAddrStr));
if (i->Size != object::UnknownAddressOrSize) if (i->Size != object::UnknownAddressOrSize)
format("%08" PRIx64, i->Size).print(SymbolSizeStr, sizeof(SymbolSizeStr)); format("%08" PRIx64, i->Size).print(SymbolSizeStr, sizeof(SymbolSizeStr));

8
llvm/tools/llvm-objdump/llvm-objdump.cpp
View File

@ -327,8 +327,8 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) {
if (error(rel_cur->getTypeName(name))) goto skip_print_rel; if (error(rel_cur->getTypeName(name))) goto skip_print_rel;
if (error(rel_cur->getValueString(val))) goto skip_print_rel; if (error(rel_cur->getValueString(val))) goto skip_print_rel;
outs() << format("\t\t\t%8"PRIx64": ", SectionAddr + addr) << name << "\t" outs() << format("\t\t\t%8" PRIx64 ": ", SectionAddr + addr) << name
<< val << "\n"; << "\t" << val << "\n";
skip_print_rel: skip_print_rel:
++rel_cur; ++rel_cur;
@ -388,8 +388,8 @@ static void PrintSectionHeaders(const ObjectFile *o) {
if (error(si->isBSS(BSS))) return; if (error(si->isBSS(BSS))) return;
std::string Type = (std::string(Text ? "TEXT " : "") + std::string Type = (std::string(Text ? "TEXT " : "") +
(Data ? "DATA " : "") + (BSS ? "BSS" : "")); (Data ? "DATA " : "") + (BSS ? "BSS" : ""));
outs() << format("%3d %-13s %09"PRIx64" %017"PRIx64" %s\n", i, Name.str().c_str(), Size, outs() << format("%3d %-13s %09" PRIx64 " %017" PRIx64 " %s\n",
Address, Type.c_str()); i, Name.str().c_str(), Size, Address, Type.c_str());
++i; ++i;
} }
} }