diff --git a/llvm/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp b/llvm/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp --- a/llvm/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp +++ b/llvm/lib/Target/AArch64/Disassembler/AArch64ExternalSymbolizer.cpp @@ -34,7 +34,9 @@ case LLVMDisassembler_VariantKind_ARM64_GOTPAGEOFF: return MCSymbolRefExpr::VK_GOTPAGEOFF; case LLVMDisassembler_VariantKind_ARM64_TLVP: + return MCSymbolRefExpr::VK_TLVPPAGE; case LLVMDisassembler_VariantKind_ARM64_TLVOFF: + return MCSymbolRefExpr::VK_TLVPPAGEOFF; default: llvm_unreachable("bad LLVMDisassembler_VariantKind"); } diff --git a/llvm/test/MC/AArch64/arm64-tls-modifiers-darwin.s b/llvm/test/MC/AArch64/arm64-tls-modifiers-darwin.s --- a/llvm/test/MC/AArch64/arm64-tls-modifiers-darwin.s +++ b/llvm/test/MC/AArch64/arm64-tls-modifiers-darwin.s @@ -1,5 +1,4 @@ ; RUN: llvm-mc -triple=arm64-apple-ios7.0 %s -o - | FileCheck %s -; RUN: llvm-mc -triple=arm64-apple-ios7.0 -filetype=obj %s -o - | llvm-objdump -r - | FileCheck %s --check-prefix=CHECK-OBJ adrp x2, _var@TLVPPAGE ldr x0, [x15, _var@TLVPPAGEOFF] @@ -7,7 +6,3 @@ ; CHECK: adrp x2, _var@TLVPPAG ; CHECK: ldr x0, [x15, _var@TLVPPAGEOFF] ; CHECK: add x30, x0, _var@TLVPPAGEOFF - -; CHECK-OBJ: 8 ARM64_RELOC_TLVP_LOAD_PAGEOFF12 _var -; CHECK-OBJ: 4 ARM64_RELOC_TLVP_LOAD_PAGEOFF12 _var -; CHECK-OBJ: 0 ARM64_RELOC_TLVP_LOAD_PAGE21 _var diff --git a/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-tlv.o b/llvm/test/tools/llvm-objdump/MachO/Inputs/macho-tlv.o new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@