summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/lib/Object/MachOObjectFile.cpp2
-rw-r--r--llvm/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64bin0 -> 316 bytes
-rw-r--r--llvm/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test3
-rw-r--r--llvm/test/tools/llvm-objdump/AArch64/macho-print-mrs.test2
4 files changed, 6 insertions, 1 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index c6ce5b0a586..928998330df 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -2477,6 +2477,8 @@ Triple MachOObjectFile::getArchTriple(uint32_t CPUType, uint32_t CPUSubType,
case MachO::CPU_TYPE_ARM64:
switch (CPUSubType & ~MachO::CPU_SUBTYPE_MASK) {
case MachO::CPU_SUBTYPE_ARM64_ALL:
+ if (McpuDefault)
+ *McpuDefault = "cyclone";
if (ArchFlag)
*ArchFlag = "arm64";
return Triple("arm64-apple-darwin");
diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64 b/llvm/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64
new file mode 100644
index 00000000000..b6ea824431c
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64
Binary files differ
diff --git a/llvm/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test b/llvm/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test
new file mode 100644
index 00000000000..e5ac0cb453e
--- /dev/null
+++ b/llvm/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test
@@ -0,0 +1,3 @@
+RUN: llvm-objdump -d -m -no-show-raw-insn %p/Inputs/print-armv8crypto.obj.macho-aarch64 | FileCheck %s
+
+CHECK: 0: sha1su0.4s v0, v1, v2
diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-print-mrs.test b/llvm/test/tools/llvm-objdump/AArch64/macho-print-mrs.test
index cc1d14faf8d..c629a4de387 100644
--- a/llvm/test/tools/llvm-objdump/AArch64/macho-print-mrs.test
+++ b/llvm/test/tools/llvm-objdump/AArch64/macho-print-mrs.test
@@ -1,3 +1,3 @@
RUN: llvm-objdump -d -m -no-show-raw-insn %p/Inputs/print-mrs.obj.macho-aarch64 | FileCheck %s
-CHECK: 0: mrs x0, S3_7_C15_C2_0
+CHECK: 0: mrs x0, CPM_IOACC_CTL_EL3
OpenPOWER on IntegriCloud