From 5ccbb28fc9d5869438e34342768cc508318e37f9 Mon Sep 17 00:00:00 2001
From: Tim Northover <tnorthover@apple.com>
Date: Fri, 8 Aug 2014 12:00:09 +0000
Subject: [PATCH] llvm-objdump: use portable format specifiers for info.

ARM bots (& others, I think, now that I look) were failing because we
were using incorrect printf-style format specifiers. They were wrong
on almost any platform, actually, just mostly harmlessly so.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215196 91177308-0d34-0410-b5e6-96231b3b80d8
---
 tools/llvm-objdump/MachODump.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index 3ba8b87d400..017e4f2b9ce 100644
--- a/tools/llvm-objdump/MachODump.cpp
+++ b/tools/llvm-objdump/MachODump.cpp
@@ -629,27 +629,27 @@ printMachOCompactUnwindSection(const MachOObjectFile *Obj,
   // Finally, we're ready to print the data we've gathered.
   outs() << "Contents of __compact_unwind section:\n";
   for (auto &Entry : CompactUnwinds) {
-    outs() << "  Entry at offset " << format("0x%x", Entry.OffsetInSection)
+    outs() << "  Entry at offset " << format("0x" PRIx32, Entry.OffsetInSection)
            << ":\n";
 
     // 1. Start of the region this entry applies to.
     outs() << "    start:                "
-           << format("0x%x", Entry.FunctionAddr) << ' ';
+           << format("0x%" PRIx64, Entry.FunctionAddr) << ' ';
     printUnwindRelocDest(Obj, Symbols, Entry.FunctionReloc,
                          Entry.FunctionAddr);
     outs() << '\n';
 
     // 2. Length of the region this entry applies to.
     outs() << "    length:               "
-           << format("0x%x", Entry.Length) << '\n';
+           << format("0x%" PRIx32, Entry.Length) << '\n';
     // 3. The 32-bit compact encoding.
     outs() << "    compact encoding:     "
-           << format("0x%08x", Entry.CompactEncoding) << '\n';
+           << format("0x%08" PRIx32, Entry.CompactEncoding) << '\n';
 
     // 4. The personality function, if present.
     if (Entry.PersonalityReloc.getObjectFile()) {
       outs() << "    personality function: "
-             << format("0x%x", Entry.PersonalityAddr) << ' ';
+             << format("0x%" PRIx64, Entry.PersonalityAddr) << ' ';
       printUnwindRelocDest(Obj, Symbols, Entry.PersonalityReloc,
                            Entry.PersonalityAddr);
       outs() << '\n';
@@ -658,7 +658,7 @@ printMachOCompactUnwindSection(const MachOObjectFile *Obj,
     // 5. This entry's language-specific data area.
     if (Entry.LSDAReloc.getObjectFile()) {
       outs() << "    LSDA:                 "
-             << format("0x%x", Entry.LSDAAddr) << ' ';
+             << format("0x%" PRIx64, Entry.LSDAAddr) << ' ';
       printUnwindRelocDest(Obj, Symbols, Entry.LSDAReloc, Entry.LSDAAddr);
       outs() << '\n';
     }