diff --git a/llvm/test/MC/AArch64/elf-globaladdress.ll b/llvm/test/MC/AArch64/elf-globaladdress.ll
index bae6b5bde35a..942920be4de2 100644
--- a/llvm/test/MC/AArch64/elf-globaladdress.ll
+++ b/llvm/test/MC/AArch64/elf-globaladdress.ll
@@ -3,7 +3,7 @@
 
 ; Also take it on a round-trip through llvm-mc to stretch assembly-parsing's legs:
 ;; RUN: llc -mtriple=aarch64-none-linux-gnu %s -o - | \
-;; RUN:     llvm-mc -arch=aarch64 -filetype=obj -o - | \
+;; RUN:     llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj -o - | \
 ;; RUN:     llvm-readobj -h -r | FileCheck -check-prefix=OBJ %s
 
 @var8 = global i8 0
diff --git a/llvm/test/MC/AArch64/elf-objdump.s b/llvm/test/MC/AArch64/elf-objdump.s
index c5aa5b19899e..51d444a36def 100644
--- a/llvm/test/MC/AArch64/elf-objdump.s
+++ b/llvm/test/MC/AArch64/elf-objdump.s
@@ -1,5 +1,5 @@
 // 64 bit little endian
-// RUN: llvm-mc -filetype=obj -arch=aarch64 -triple aarch64-none-linux-gnu %s -o - | llvm-objdump -d
+// RUN: llvm-mc -filetype=obj -triple aarch64-none-linux-gnu %s -o - | llvm-objdump -d
 
 // We just want to see if llvm-objdump works at all.
 // CHECK: .text
diff --git a/llvm/test/MC/AArch64/elf-reloc-addsubimm.s b/llvm/test/MC/AArch64/elf-reloc-addsubimm.s
index 30490be7e1d2..0321dda332c2 100644
--- a/llvm/test/MC/AArch64/elf-reloc-addsubimm.s
+++ b/llvm/test/MC/AArch64/elf-reloc-addsubimm.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         add x2, x3, #:lo12:some_label
diff --git a/llvm/test/MC/AArch64/elf-reloc-condbr.s b/llvm/test/MC/AArch64/elf-reloc-condbr.s
index f55ba86bf360..684e75a33cb7 100644
--- a/llvm/test/MC/AArch64/elf-reloc-condbr.s
+++ b/llvm/test/MC/AArch64/elf-reloc-condbr.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         b.eq somewhere
diff --git a/llvm/test/MC/AArch64/elf-reloc-ldrlit.s b/llvm/test/MC/AArch64/elf-reloc-ldrlit.s
index fa318df1c91a..de43c4feac98 100644
--- a/llvm/test/MC/AArch64/elf-reloc-ldrlit.s
+++ b/llvm/test/MC/AArch64/elf-reloc-ldrlit.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         ldr x0, some_label
diff --git a/llvm/test/MC/AArch64/elf-reloc-ldstunsimm.s b/llvm/test/MC/AArch64/elf-reloc-ldstunsimm.s
index 6ad5c1f63491..e1f841bd20f7 100644
--- a/llvm/test/MC/AArch64/elf-reloc-ldstunsimm.s
+++ b/llvm/test/MC/AArch64/elf-reloc-ldstunsimm.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         ldrb w0, [sp, #:lo12:some_label]
diff --git a/llvm/test/MC/AArch64/elf-reloc-movw.s b/llvm/test/MC/AArch64/elf-reloc-movw.s
index 1538d5dd1e44..8a7e532cdd23 100644
--- a/llvm/test/MC/AArch64/elf-reloc-movw.s
+++ b/llvm/test/MC/AArch64/elf-reloc-movw.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         movz x0, #:abs_g0:some_label
diff --git a/llvm/test/MC/AArch64/elf-reloc-pcreladdressing.s b/llvm/test/MC/AArch64/elf-reloc-pcreladdressing.s
index 52b75a136fe1..b5f072712fd7 100644
--- a/llvm/test/MC/AArch64/elf-reloc-pcreladdressing.s
+++ b/llvm/test/MC/AArch64/elf-reloc-pcreladdressing.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         adr x2, some_label
diff --git a/llvm/test/MC/AArch64/elf-reloc-tstb.s b/llvm/test/MC/AArch64/elf-reloc-tstb.s
index aecd65bd8a72..037e89632e82 100644
--- a/llvm/test/MC/AArch64/elf-reloc-tstb.s
+++ b/llvm/test/MC/AArch64/elf-reloc-tstb.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         tbz x6, #45, somewhere
diff --git a/llvm/test/MC/AArch64/elf-reloc-uncondbrimm.s b/llvm/test/MC/AArch64/elf-reloc-uncondbrimm.s
index 7a7238f038bd..bead07c12d2c 100644
--- a/llvm/test/MC/AArch64/elf-reloc-uncondbrimm.s
+++ b/llvm/test/MC/AArch64/elf-reloc-uncondbrimm.s
@@ -1,4 +1,4 @@
-// RUN: llvm-mc -arch=aarch64 -filetype=obj %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj %s -o - | \
 // RUN:   llvm-readobj -r | FileCheck -check-prefix=OBJ %s
 
         b somewhere
diff --git a/llvm/test/MC/AArch64/tls-relocs.s b/llvm/test/MC/AArch64/tls-relocs.s
index c4cccdabbc4b..d0e336ecaf23 100644
--- a/llvm/test/MC/AArch64/tls-relocs.s
+++ b/llvm/test/MC/AArch64/tls-relocs.s
@@ -1,5 +1,5 @@
-// RUN: llvm-mc -arch=aarch64 -show-encoding < %s | FileCheck %s
-// RUN: llvm-mc -arch=aarch64 -filetype=obj < %s -o - | \
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -show-encoding < %s | FileCheck %s
+// RUN: llvm-mc -triple=aarch64-none-linux-gnu -filetype=obj < %s -o - | \
 // RUN:   llvm-readobj -r -t | FileCheck --check-prefix=CHECK-ELF %s
 
         // TLS local-dynamic forms