[llvm-branch-commits] [llvm-branch] r310396 - Merging r310250:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug  8 11:40:46 2017
New Revision: 310396

URL: http://llvm.org/viewvc/llvm-project?rev=310396&view=rev
Log:
Merging r310250:
------------------------------------------------------------------------
r310250 | sdardis | 2017-08-07 05:29:38 -0700 (Mon, 07 Aug 2017) | 2 lines

[llvm-objdump] Use PRIx64 for output of ARM64_RELOC_ADDEND

------------------------------------------------------------------------

Modified:
    llvm/branches/release_50/   (props changed)
    llvm/branches/release_50/tools/llvm-objdump/llvm-objdump.cpp

Propchange: llvm/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug  8 11:40:46 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,308483-308484,308503,308808,308813,308891,308906,308950,308963,308978,308986,309113,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309651,309744,309849,309928,309930,310071,310190,310240-310242
+/llvm/trunk:155241,308483-308484,308503,308808,308813,308891,308906,308950,308963,308978,308986,309113,309302,309321,309323,309325,309330,309343,309353,309355,309422,309481,309483,309495,309555,309561,309594,309651,309744,309849,309928,309930,310071,310190,310240-310242,310250

Modified: llvm/branches/release_50/tools/llvm-objdump/llvm-objdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_50/tools/llvm-objdump/llvm-objdump.cpp?rev=310396&r1=310395&r2=310396&view=diff
==============================================================================
--- llvm/branches/release_50/tools/llvm-objdump/llvm-objdump.cpp (original)
+++ llvm/branches/release_50/tools/llvm-objdump/llvm-objdump.cpp Tue Aug  8 11:40:46 2017
@@ -871,7 +871,7 @@ static void printRelocationTargetName(co
   uint64_t Val = O->getPlainRelocationSymbolNum(RE);
 
   if (O->getAnyRelocationType(RE) == MachO::ARM64_RELOC_ADDEND) {
-    fmt << format("0x%x", Val);
+    fmt << format("0x%0" PRIx64, Val);
     return;
   } else if (isExtern) {
     symbol_iterator SI = O->symbol_begin();