diff --git a/lld/MachO/Arch/ARM64Common.cpp b/lld/MachO/Arch/ARM64Common.cpp --- a/lld/MachO/Arch/ARM64Common.cpp +++ b/lld/MachO/Arch/ARM64Common.cpp @@ -98,8 +98,9 @@ // ARM DDI 0487G.a (ID011921) uint32_t instruction = read32le(loc); // C6.2.132 LDR (immediate) - // LDR , [{, #}] - if ((instruction & 0xffc00000) != 0xf9400000) + // This matches both the 64- and 32-bit variants: + // LDR <(X|W)t>, [{, #}] + if ((instruction & 0xbfc00000) != 0xb9400000) error(getRelocAttrs(type).name + " reloc requires LDR instruction"); assert(((instruction >> 10) & 0xfff) == 0 && "non-zero embedded LDR immediate"); diff --git a/lld/test/MachO/arm64-32-reloc-got-load.s b/lld/test/MachO/arm64-32-reloc-got-load.s new file mode 100644 --- /dev/null +++ b/lld/test/MachO/arm64-32-reloc-got-load.s @@ -0,0 +1,48 @@ +# REQUIRES: aarch64 + +# RUN: rm -rf %t; split-file %s %t +# RUN: llvm-mc -filetype=obj -triple=arm64_32-apple-darwin %t/main.s -o %t/main.o +# RUN: llvm-mc -filetype=obj -triple=arm64_32-apple-darwin %t/foobar.s -o %t/foobar.o + +# RUN: %lld-watchos -lSystem -arch arm64_32 -o %t/static %t/main.o %t/foobar.o +# RUN: llvm-objdump --macho -d --no-show-raw-insn --syms %t/static | FileCheck %s --check-prefix=STATIC + +# RUN: %lld-watchos -lSystem -arch arm64_32 -dylib -o %t/libfoo.dylib %t/foobar.o +# RUN: %lld-watchos -lSystem -arch arm64_32 -o %t/main %t/main.o %t/libfoo.dylib +# RUN: llvm-objdump --macho -d --no-show-raw-insn --section-headers %t/main | FileCheck %s --check-prefix=DYLIB + +# STATIC-LABEL: _main: +# STATIC-NEXT: adrp x8, [[#]] ; 0x[[#%x,PAGE:]] +# STATIC-NEXT: add x8, x8, #[[#%u,FOO_OFF:]] +# STATIC-NEXT: adrp x8, [[#]] ; 0x[[#PAGE]] +# STATIC-NEXT: add x8, x8, #[[#%u,BAR_OFF:]] +# STATIC-NEXT: ret + +# STATIC-LABEL: SYMBOL TABLE: +# STATIC-DAG: {{0*}}[[#%x,PAGE+FOO_OFF]] g F __TEXT,__text _foo +# STATIC-DAG: {{0*}}[[#%x,PAGE+BAR_OFF]] g F __TEXT,__text _bar + +# DYLIB-LABEL: _main: +# DYLIB-NEXT: adrp x8, [[#]] ; 0x[[#%x,GOT:]] +# DYLIB-NEXT: ldr w8, [x8, #4] +# DYLIB-NEXT: adrp x8, [[#]] ; 0x[[#GOT]] +# DYLIB-NEXT: ldr w8, [x8] +# DYLIB-NEXT: ret +# DYLIB-NEXT: Sections: +# DYLIB-NEXT: Idx Name Size VMA Type +# DYLIB: [[#]] __got 00000008 [[#%.8x,GOT]] DATA + +#--- main.s +.globl _main, _foo, _bar +.p2align 2 +_main: + adrp x8, _foo@GOTPAGE + ldr w8, [x8, _foo@GOTPAGEOFF] + adrp x8, _bar@GOTPAGE + ldr w8, [x8, _bar@GOTPAGEOFF] + ret + +#--- foobar.s +.globl _foo, _bar +_foo: +_bar: