[llvm] r226936 - Fix the problem with llvm-objdump and -archive-headers in printing the archive header size field.

[Kevin Enderby]

Author: enderby
Date: Fri Jan 23 15:02:44 2015
New Revision: 226936

URL: http://llvm.org/viewvc/llvm-project?rev=226936&view=rev
Log:
Fix the problem with llvm-objdump and -archive-headers in printing the archive header size field.
This problem showed up with the clang-cmake-armv7-a15-full bot.  Thanks to Renato Golin for his help.

Modified:
    llvm/trunk/test/tools/llvm-objdump/X86/macho-archive-headers.test
    llvm/trunk/tools/llvm-objdump/MachODump.cpp

Modified: llvm/trunk/test/tools/llvm-objdump/X86/macho-archive-headers.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/X86/macho-archive-headers.test?rev=226936&r1=226935&r2=226936&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/X86/macho-archive-headers.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/X86/macho-archive-headers.test Fri Jan 23 15:02:44 2015
@@ -3,8 +3,8 @@ RUN: | FileCheck %s
 
 # Note the date as printed by ctime(3) is time zone dependent and not checked.
 CHECK: Archive : {{.*}}/macho-universal-archive.x86_64.i386 (architecture x86_64)
-CHECK: -rw-r--r--124/11 {{.*}} __.SYMDEF SORTED
-CHECK: -rw-r--r--124/0  {{.*}} hello.o
+CHECK: -rw-r--r--124/11     44 {{.*}} __.SYMDEF SORTED
+CHECK: -rw-r--r--124/0     860 {{.*}} hello.o
 CHECK: Archive : {{.*}}/macho-universal-archive.x86_64.i386 (architecture i386)
-CHECK: -rw-r--r--124/11 {{.*}} __.SYMDEF SORTED
-CHECK: -rw-r--r--124/0  {{.*}} foo.o
+CHECK: -rw-r--r--124/11     60 {{.*}} __.SYMDEF SORTED
+CHECK: -rw-r--r--124/0     388 {{.*}} foo.o

Modified: llvm/trunk/tools/llvm-objdump/MachODump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-objdump/MachODump.cpp?rev=226936&r1=226935&r2=226936&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-objdump/MachODump.cpp (original)
+++ llvm/trunk/tools/llvm-objdump/MachODump.cpp Fri Jan 23 15:02:44 2015
@@ -749,7 +749,7 @@ static void printArchiveChild(Archive::C
   unsigned GID = C.getGID();
   outs() << format("%-3d ", GID);
   uint64_t Size = C.getRawSize();
-  outs() << format("%5d ", Size);
+  outs() << format("%5" PRId64, Size) << " ";
 
   StringRef RawLastModified = C.getRawLastModified();
   if (verbose) {