diff --git a/test/MC/MachO/AArch64/cstexpr-gotpcrel.ll b/test/MC/MachO/AArch64/cstexpr-gotpcrel.ll
new file mode 100644
index 00000000000..2711f03573c
--- /dev/null
+++ b/test/MC/MachO/AArch64/cstexpr-gotpcrel.ll
@@ -0,0 +1,88 @@
+; RUN: llc -mtriple=arm64-apple-darwin %s -o %t
+; RUN:  FileCheck %s -check-prefix=ARM < %t
+; RUN:  FileCheck %s -check-prefix=ARM-GOT-EQUIV < %t
+
+; GOT equivalent globals references can be replaced by the GOT entry of the
+; final symbol instead.
+
+%struct.data = type { i32, %struct.anon }
+%struct.anon = type { i32, i32 }
+
+; Check that these got equivalent symbols are never emitted on x86-64 and
+; emitted on ARM64. Since ARM64 does not support encoding an extra offset with
+; @GOT, we still need to emit the equivalents for use by such IR constructs.
+
+; ARM-GOT-EQUIV-LABEL: l_extgotequiv:
+; ARM-GOT-EQUIV-LABEL: l_localgotequiv:
+@localfoo = global i32 42
+@localgotequiv = private unnamed_addr constant i32* @localfoo
+
+@extfoo = external global i32
+@extgotequiv = private unnamed_addr constant i32* @extfoo
+
+; Don't replace GOT equivalent usage within instructions and emit the GOT
+; equivalent since it can't be replaced by the GOT entry. @bargotequiv is
+; used by an instruction inside @t0.
+;
+; ARM: l_bargotequiv:
+; ARM-NEXT:  .quad   _extbar
+@extbar = external global i32
+@bargotequiv = private unnamed_addr constant i32* @extbar
+
+@table = global [4 x %struct.data] [
+; ARM-LABEL: _table
+  %struct.data { i32 1, %struct.anon { i32 2, i32 3 } },
+; Test GOT equivalent usage inside nested constant arrays.
+
+; ARM: .long   5
+; ARM-NOT: .long   _localgotequiv-(_table+20)
+; ARM-NEXT: Ltmp1:
+; ARM-NEXT: .long _localfoo@GOT-Ltmp1
+  %struct.data { i32 4, %struct.anon { i32 5,
+    i32 trunc (i64 sub (i64 ptrtoint (i32** @localgotequiv to i64),
+                        i64 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i64 1, i32 1, i32 1) to i64))
+                        to i32)}
+  },
+
+; ARM: .long   5
+; ARM-NOT: _extgotequiv-(_table+32)
+; ARM-NEXT: Ltmp2:
+; ARM-NEXT: _extfoo@GOT-Ltmp2
+  %struct.data { i32 4, %struct.anon { i32 5,
+    i32 trunc (i64 sub (i64 ptrtoint (i32** @extgotequiv to i64),
+                        i64 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i64 2, i32 1, i32 1) to i64))
+                        to i32)}
+  },
+; Test support for arbitrary constants into the GOTPCREL offset, which is
+; supported on x86-64 but not on ARM64
+
+; ARM: .long   5
+; ARM-NEXT: .long (l_extgotequiv-(_table+44))+24
+  %struct.data { i32 4, %struct.anon { i32 5,
+    i32 add (i32 trunc (i64 sub (i64 ptrtoint (i32** @extgotequiv to i64),
+                                 i64 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i64 3, i32 1, i32 1) to i64))
+                                 to i32), i32 24)}
+  }
+], align 16
+
+; Test multiple uses of GOT equivalents.
+
+; ARM-LABEL: _delta
+; ARM: Ltmp3:
+; ARM-NEXT:  .long _extfoo@GOT-Ltmp3
+@delta = global i32 trunc (i64 sub (i64 ptrtoint (i32** @extgotequiv to i64),
+                                    i64 ptrtoint (i32* @delta to i64))
+                           to i32)
+
+; ARM-LABEL: _deltaplus:
+; ARM: .long  (l_localgotequiv-_deltaplus)+55
+@deltaplus = global i32 add (i32 trunc (i64 sub (i64 ptrtoint (i32** @localgotequiv to i64),
+                                        i64 ptrtoint (i32* @deltaplus to i64))
+                                        to i32), i32 55)
+
+define i32 @t0(i32 %a) {
+  %x = add i32 trunc (i64 sub (i64 ptrtoint (i32** @bargotequiv to i64),
+                               i64 ptrtoint (i32 (i32)* @t0 to i64))
+                           to i32), %a
+  ret i32 %x
+}
diff --git a/test/MC/MachO/ARM/cstexpr-gotpcrel.ll b/test/MC/MachO/ARM/cstexpr-gotpcrel.ll
new file mode 100644
index 00000000000..f7d988ac847
--- /dev/null
+++ b/test/MC/MachO/ARM/cstexpr-gotpcrel.ll
@@ -0,0 +1,74 @@
+; RUN: llc -mtriple=arm-apple-darwin %s -o %t
+; RUN:  FileCheck %s < %t
+; RUN:  FileCheck %s -check-prefix=GOT-EQUIV < %t
+
+; GOT equivalent globals references can be replaced by the GOT entry of the
+; final symbol instead.
+
+%struct.data = type { i32, %struct.anon }
+%struct.anon = type { i32, i32 }
+
+; Check that these got equivalent symbols are never emitted or used
+; GOT-EQUIV-NOT: _localgotequiv
+; GOT-EQUIV-NOT: _extgotequiv
+@localfoo = global i32 42
+@localgotequiv = private unnamed_addr constant i32* @localfoo
+
+@extfoo = external global i32
+@extgotequiv = private unnamed_addr constant i32* @extfoo
+
+; Don't replace GOT equivalent usage within instructions and emit the GOT
+; equivalent since it can't be replaced by the GOT entry. @bargotequiv is
+; used by an instruction inside @t0.
+;
+; CHECK: l_bargotequiv:
+; CHECK-NEXT:  .long   _extbar
+@extbar = external global i32
+@bargotequiv = private unnamed_addr constant i32* @extbar
+
+@table = global [4 x %struct.data] [
+; CHECK-LABEL: _table
+  %struct.data { i32 1, %struct.anon { i32 2, i32 3 } },
+; Test GOT equivalent usage inside nested constant arrays.
+; CHECK: .long   5
+; CHECK-NOT: l_localgotequiv-(_table+20)
+; CHECK-NEXT: L_localfoo$non_lazy_ptr-(_table+20)
+  %struct.data { i32 4, %struct.anon { i32 5,
+    i32 sub (i32 ptrtoint (i32** @localgotequiv to i32),
+             i32 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i32 1, i32 1, i32 1) to i32))}
+  },
+; CHECK: .long   5
+; CHECK-NOT: l_extgotequiv-(_table+32)
+; CHECK-NEXT: L_extfoo$non_lazy_ptr-(_table+32)
+  %struct.data { i32 4, %struct.anon { i32 5,
+    i32 sub (i32 ptrtoint (i32** @extgotequiv to i32),
+             i32 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i32 2, i32 1, i32 1) to i32))}
+  },
+; Test support for arbitrary constants into the GOTPCREL offset
+; CHECK: .long   5
+; CHECK-NOT: (l_extgotequiv-(_table+44))+24
+; CHECK-NEXT: L_extfoo$non_lazy_ptr-(_table+20)
+  %struct.data { i32 4, %struct.anon { i32 5,
+    i32 add (i32 sub (i32 ptrtoint (i32** @extgotequiv to i32),
+                      i32 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i32 3, i32 1, i32 1) to i32)),
+                      i32 24)}
+  }
+], align 16
+
+; Test multiple uses of GOT equivalents.
+; CHECK-LABEL: _delta
+; CHECK: .long   L_extfoo$non_lazy_ptr-_delta
+@delta = global i32 sub (i32 ptrtoint (i32** @extgotequiv to i32),
+                         i32 ptrtoint (i32* @delta to i32))
+
+; CHECK-LABEL: _deltaplus:
+; CHECK: .long   L_localfoo$non_lazy_ptr-(_deltaplus-55)
+@deltaplus = global i32 add (i32 sub (i32 ptrtoint (i32** @localgotequiv to i32),
+                             i32 ptrtoint (i32* @deltaplus to i32)),
+                             i32 55)
+
+define i32 @t0(i32 %a) {
+  %x = add i32 sub (i32 ptrtoint (i32** @bargotequiv to i32),
+                    i32 ptrtoint (i32 (i32)* @t0 to i32)), %a
+  ret i32 %x
+}
diff --git a/test/MC/MachO/cstexpr-gotpcrel-32.ll b/test/MC/MachO/cstexpr-gotpcrel-32.ll
index a28c0293c97..f279fc29cd4 100644
--- a/test/MC/MachO/cstexpr-gotpcrel-32.ll
+++ b/test/MC/MachO/cstexpr-gotpcrel-32.ll
@@ -1,9 +1,6 @@
 ; RUN: llc -mtriple=i386-apple-darwin %s -o %t
 ; RUN:  FileCheck %s < %t
 ; RUN:  FileCheck %s -check-prefix=GOT-EQUIV < %t
-; RUN: llc -mtriple=arm-apple-darwin %s -o %t
-; RUN:  FileCheck %s < %t
-; RUN:  FileCheck %s -check-prefix=GOT-EQUIV < %t
 
 ; GOT equivalent globals references can be replaced by the GOT entry of the
 ; final symbol instead.
diff --git a/test/MC/MachO/cstexpr-gotpcrel-64.ll b/test/MC/MachO/cstexpr-gotpcrel-64.ll
index 56862fe5073..7bbc088481f 100644
--- a/test/MC/MachO/cstexpr-gotpcrel-64.ll
+++ b/test/MC/MachO/cstexpr-gotpcrel-64.ll
@@ -1,9 +1,6 @@
 ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t
 ; RUN:  FileCheck %s -check-prefix=X86 < %t
 ; RUN:  FileCheck %s -check-prefix=X86-GOT-EQUIV < %t
-; RUN: llc -mtriple=arm64-apple-darwin %s -o %t
-; RUN:  FileCheck %s -check-prefix=ARM < %t
-; RUN:  FileCheck %s -check-prefix=ARM-GOT-EQUIV < %t
 
 ; GOT equivalent globals references can be replaced by the GOT entry of the
 ; final symbol instead.
@@ -11,15 +8,10 @@
 %struct.data = type { i32, %struct.anon }
 %struct.anon = type { i32, i32 }
 
-; Check that these got equivalent symbols are never emitted on x86-64 and
-; emitted on ARM64. Since ARM64 does not support encoding an extra offset with
-; @GOT, we still need to emit the equivalents for use by such IR constructs.
+; Check that these got equivalent symbols are never emitted.
 
 ; X86-GOT-EQUIV-NOT: L_localgotequiv
 ; X86-GOT-EQUIV-NOT: l_extgotequiv
-
-; ARM-GOT-EQUIV-LABEL: l_extgotequiv:
-; ARM-GOT-EQUIV-LABEL: l_localgotequiv:
 @localfoo = global i32 42
 @localgotequiv = private unnamed_addr constant i32* @localfoo
 
@@ -32,25 +24,16 @@
 ;
 ; X86: l_bargotequiv:
 ; X86-NEXT:  .quad   _extbar
-; ARM: l_bargotequiv:
-; ARM-NEXT:  .quad   _extbar
 @extbar = external global i32
 @bargotequiv = private unnamed_addr constant i32* @extbar
 
 @table = global [4 x %struct.data] [
-; X86-LABEL: _table
-; ARM-LABEL: _table
   %struct.data { i32 1, %struct.anon { i32 2, i32 3 } },
 ; Test GOT equivalent usage inside nested constant arrays.
 
 ; X86: .long   5
 ; X86-NOT: .long   _localgotequiv-(_table+20)
 ; X86-NEXT: .long   _localfoo@GOTPCREL+4
-
-; ARM: .long   5
-; ARM-NOT: .long   _localgotequiv-(_table+20)
-; ARM-NEXT: Ltmp1:
-; ARM-NEXT: .long _localfoo@GOT-Ltmp1
   %struct.data { i32 4, %struct.anon { i32 5,
     i32 trunc (i64 sub (i64 ptrtoint (i32** @localgotequiv to i64),
                         i64 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i64 1, i32 1, i32 1) to i64))
@@ -59,25 +42,16 @@
 ; X86: .long   5
 ; X86-NOT: _extgotequiv-(_table+32)
 ; X86-NEXT: .long   _extfoo@GOTPCREL+4
-
-; ARM: .long   5
-; ARM-NOT: _extgotequiv-(_table+32)
-; ARM-NEXT: Ltmp2:
-; ARM-NEXT: _extfoo@GOT-Ltmp2
   %struct.data { i32 4, %struct.anon { i32 5,
     i32 trunc (i64 sub (i64 ptrtoint (i32** @extgotequiv to i64),
                         i64 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i64 2, i32 1, i32 1) to i64))
                         to i32)}
   },
-; Test support for arbitrary constants into the GOTPCREL offset, which is
-; supported on x86-64 but not on ARM64
+; Test support for arbitrary constants into the GOTPCREL offset.
 
 ; X86: .long   5
 ; X86-NOT: _extgotequiv-(_table+44)
 ; X86-NEXT: .long   _extfoo@GOTPCREL+28
-
-; ARM: .long   5
-; ARM-NEXT: .long (l_extgotequiv-(_table+44))+24
   %struct.data { i32 4, %struct.anon { i32 5,
     i32 add (i32 trunc (i64 sub (i64 ptrtoint (i32** @extgotequiv to i64),
                                  i64 ptrtoint (i32* getelementptr inbounds ([4 x %struct.data]* @table, i32 0, i64 3, i32 1, i32 1) to i64))
@@ -89,19 +63,12 @@
 
 ; X86-LABEL: _delta
 ; X86: .long   _extfoo@GOTPCREL+4
-
-; ARM-LABEL: _delta
-; ARM: Ltmp3:
-; ARM-NEXT:  .long _extfoo@GOT-Ltmp3
 @delta = global i32 trunc (i64 sub (i64 ptrtoint (i32** @extgotequiv to i64),
                                     i64 ptrtoint (i32* @delta to i64))
                            to i32)
 
 ; X86-LABEL: _deltaplus:
 ; X86: .long   _localfoo@GOTPCREL+59
-
-; ARM-LABEL: _deltaplus:
-; ARM: .long  (l_localgotequiv-_deltaplus)+55
 @deltaplus = global i32 add (i32 trunc (i64 sub (i64 ptrtoint (i32** @localgotequiv to i64),
                                         i64 ptrtoint (i32* @deltaplus to i64))
                                         to i32), i32 55)