From 0aa6910479cfc868667f3a926edf8d52dd91974d Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Fri, 10 Feb 2017 19:27:10 +0000
Subject: [PATCH] Yet another fix llvm-objdump so it picks a good CPU based for
 Mach-O files, in this case for CPU_SUBTYPE_ARM64_ALL.

For this cpusubtype it should default to a cyclone CPU
to give proper disassembly without a -mcpu= flag.

rdar://27767188


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294771 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Object/MachOObjectFile.cpp                            |   2 ++
 .../AArch64/Inputs/print-armv8crypto.obj.macho-aarch64    | Bin 0 -> 316 bytes
 .../llvm-objdump/AArch64/mach-print-armv8crypto.test      |   3 +++
 test/tools/llvm-objdump/AArch64/macho-print-mrs.test      |   2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64
 create mode 100644 test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test

diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp
index c6ce5b0a586..928998330df 100644
--- a/lib/Object/MachOObjectFile.cpp
+++ b/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/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64 b/test/tools/llvm-objdump/AArch64/Inputs/print-armv8crypto.obj.macho-aarch64
new file mode 100644
index 0000000000000000000000000000000000000000..b6ea824431c1cfa244707c59b311010eed342f80
GIT binary patch
literal 316
zcmX^A>+L@t1_nk3AOI1}Fb0SQ0!bjA0cK$*SfIiRU=tV^V0?C<I0!?98RFwhQY%Uj
zX2i#bxJHB^_%IesKg>LsIMCn*I2*`d0%8duRsmW7vcm*OZ~$p;APxXx5CDmTFbKeC
Y2#<JD!GI|aq?ZrbfSi)t0s{sH01lE3X8-^I

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test b/test/tools/llvm-objdump/AArch64/mach-print-armv8crypto.test
new file mode 100644
index 00000000000..e5ac0cb453e
--- /dev/null
+++ b/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/test/tools/llvm-objdump/AArch64/macho-print-mrs.test b/test/tools/llvm-objdump/AArch64/macho-print-mrs.test
index cc1d14faf8d..c629a4de387 100644
--- a/test/tools/llvm-objdump/AArch64/macho-print-mrs.test
+++ b/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
-- 
2.11.0