Commit 6131d993 authored by Bill Wendling's avatar Bill Wendling
Browse files

Fixes r142984, r143120 and r143191 for PPC. 

llvm-svn: 143447
parent 12bfc791

llvm/tools/llvm-nm/llvm-nm.cpp

+2 −2
Original line number Diff line number Diff line
@@ -192,9 +192,9 @@ static void SortAndPrintSymbolList() { 
      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 << " "

llvm/tools/llvm-objdump/llvm-objdump.cpp

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { 


        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 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { 
          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: