From 5dbda1ece15293d15445a80d035ed7dc39a17373 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Thu, 13 Jul 2017 17:03:02 +0000
Subject: [PATCH] [llvm-objdump] Properly print MachO aarch64 addend
 relocations

Previously such relocations fell into the last case for local
symbols, using the relocation addend as symbol index, leading to
a crash.

Differential Revision: https://reviews.llvm.org/D35239

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307927 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../AArch64/Inputs/reloc-addend.obj.macho-aarch64 | Bin 0 -> 424 bytes
 .../llvm-objdump/AArch64/macho-reloc-addend.test  |   6 ++++++
 tools/llvm-objdump/llvm-objdump.cpp               |   5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 test/tools/llvm-objdump/AArch64/Inputs/reloc-addend.obj.macho-aarch64
 create mode 100644 test/tools/llvm-objdump/AArch64/macho-reloc-addend.test

diff --git a/test/tools/llvm-objdump/AArch64/Inputs/reloc-addend.obj.macho-aarch64 b/test/tools/llvm-objdump/AArch64/Inputs/reloc-addend.obj.macho-aarch64
new file mode 100644
index 0000000000000000000000000000000000000000..58ed3c7a48fc5e67a957095a1257488c1829ff81
GIT binary patch
literal 424
zcmX^A>+L@t1_nk3AOI08Kr8^}fkYS>B!PGan1!7H>IDM>s2&)f9ViOIFr(t*OHwOJ
zAZkHme0+#&L<oWpW5M);%mcZ_21)}t4KOtzS`~-|zyhpbk_kvk0C5aZJu{H*0n#!+
znj44%fEWaTLU0UH58{&nCIIzJJir`(4dlL=oD54qG|)UBkXax;hz9a)MSwIPk|iJ}
nKN6o4$VcJ=10_ARB%q{-A-=ezC^IiTsWgotrzE$)0H_WC?I0VN

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-objdump/AArch64/macho-reloc-addend.test b/test/tools/llvm-objdump/AArch64/macho-reloc-addend.test
new file mode 100644
index 00000000000..4cc4a6eca2a
--- /dev/null
+++ b/test/tools/llvm-objdump/AArch64/macho-reloc-addend.test
@@ -0,0 +1,6 @@
+RUN: llvm-objdump -r %p/Inputs/reloc-addend.obj.macho-aarch64 | FileCheck %s
+
+CHECK-DAG: 0000000000000004 ARM64_RELOC_ADDEND 0x999
+CHECK-DAG: 0000000000000004 ARM64_RELOC_PAGEOFF12 _stringbuf
+CHECK-DAG: 0000000000000000 ARM64_RELOC_ADDEND 0x999
+CHECK-DAG: 0000000000000000 ARM64_RELOC_PAGE21 _stringbuf
diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp
index 812f1af3ac6..d54b45515f0 100644
--- a/tools/llvm-objdump/llvm-objdump.cpp
+++ b/tools/llvm-objdump/llvm-objdump.cpp
@@ -870,7 +870,10 @@ static void printRelocationTargetName(const MachOObjectFile *O,
   bool isExtern = O->getPlainRelocationExternal(RE);
   uint64_t Val = O->getPlainRelocationSymbolNum(RE);
 
-  if (isExtern) {
+  if (O->getAnyRelocationType(RE) == MachO::ARM64_RELOC_ADDEND) {
+    fmt << format("0x%x", Val);
+    return;
+  } else if (isExtern) {
     symbol_iterator SI = O->symbol_begin();
     advance(SI, Val);
     Expected<StringRef> SOrErr = SI->getName();