[llvm-branch-commits] [llvm-branch] r143447 - in /llvm/branches/release_30/tools: llvm-nm/llvm-nm.cpp llvm-objdump/llvm-objdump.cpp

[Bill Wendling]

Author: void
Date: Tue Nov  1 00:05:06 2011
New Revision: 143447

URL: http://llvm.org/viewvc/llvm-project?rev=143447&view=rev
Log:
Fixes r142984, r143120 and r143191 for PPC.

Modified:
    llvm/branches/release_30/tools/llvm-nm/llvm-nm.cpp
    llvm/branches/release_30/tools/llvm-objdump/llvm-objdump.cpp

Modified: llvm/branches/release_30/tools/llvm-nm/llvm-nm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/tools/llvm-nm/llvm-nm.cpp?rev=143447&r1=143446&r2=143447&view=diff
==============================================================================
--- llvm/branches/release_30/tools/llvm-nm/llvm-nm.cpp (original)
+++ llvm/branches/release_30/tools/llvm-nm/llvm-nm.cpp Tue Nov  1 00:05:06 2011
@@ -192,9 +192,9 @@
       strcpy(SymbolSizeStr, "        ");
 
     if (i->Address != object::UnknownAddressOrSize)
-      format("%08x", i->Address).print(SymbolAddrStr, sizeof(SymbolAddrStr));
+      format("%08"PRIx64, i->Address).print(SymbolAddrStr, sizeof(SymbolAddrStr));
     if (i->Size != object::UnknownAddressOrSize)
-      format("%08x", i->Size).print(SymbolSizeStr, sizeof(SymbolSizeStr));
+      format("%08"PRIx64, i->Size).print(SymbolSizeStr, sizeof(SymbolSizeStr));
 
     if (OutputFormat == posix) {
       outs() << i->Name << " " << i->TypeChar << " "

Modified: llvm/branches/release_30/tools/llvm-objdump/llvm-objdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/tools/llvm-objdump/llvm-objdump.cpp?rev=143447&r1=143446&r2=143447&view=diff
==============================================================================
--- llvm/branches/release_30/tools/llvm-objdump/llvm-objdump.cpp (original)
+++ llvm/branches/release_30/tools/llvm-objdump/llvm-objdump.cpp Tue Nov  1 00:05:06 2011
@@ -285,7 +285,7 @@
 
         if (DisAsm->getInstruction(Inst, Size, memoryObject, Index,
                                    DebugOut, nulls())) {
-          outs() << format("%8x:\t", SectionAddr + Index);
+          outs() << format("%8"PRIx64":\t", SectionAddr + Index);
           DumpBytes(StringRef(Bytes.data() + Index, Size));
           IP->printInst(&Inst, outs(), "");
           outs() << "\n";
@@ -306,7 +306,7 @@
           if (error(rel_cur->getTypeName(name))) goto skip_print_rel;
           if (error(rel_cur->getValueString(val))) goto skip_print_rel;
 
-          outs() << format("\t\t\t%8x: ", SectionAddr + addr) << name << "\t"
+          outs() << format("\t\t\t%8"PRIx64": ", SectionAddr + addr) << name << "\t"
                  << val << "\n";
 
         skip_print_rel: