[lld-macho] Make load relaxation work for arm64_32
arm64_32 uses 32-bit GOT loads, so we should accept those
instructions in `ARM64Common::relaxGotLoad()` too.
Reviewed By: #lld-macho, gkm
Differential Revision: https://reviews.llvm.org/D100229
GitOrigin-RevId: 1acda12d00ec2ea769998af4f3df6e98781185d1
diff --git a/MachO/Arch/ARM64Common.cpp b/MachO/Arch/ARM64Common.cpp
index a9acd1a..88e7286 100644
--- a/MachO/Arch/ARM64Common.cpp
+++ b/MachO/Arch/ARM64Common.cpp
@@ -98,8 +98,9 @@
// ARM DDI 0487G.a (ID011921)
uint32_t instruction = read32le(loc);
// C6.2.132 LDR (immediate)
- // LDR <Xt>, [<Xn|SP>{, #<pimm>}]
- if ((instruction & 0xffc00000) != 0xf9400000)
+ // This matches both the 64- and 32-bit variants:
+ // LDR <(X|W)t>, [<Xn|SP>{, #<pimm>}]
+ 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/test/MachO/arm64-32-reloc-got-load.s b/test/MachO/arm64-32-reloc-got-load.s
new file mode 100644
index 0000000..b26aea3
--- /dev/null
+++ b/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:
