From: Frederic Riss <friss@apple.com>
Date: Tue, 16 Jun 2015 17:37:03 +0000 (+0000)
Subject: Have MachOObjectFile::isValidArch() accept armv7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40baa0aad4feed367415918146a99dd0a0c271d8;p=platform%2Fupstream%2Fllvm.git

Have MachOObjectFile::isValidArch() accept armv7

llvm-svn: 239833
---

diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp
index d02ca48..adb8cab 100644
--- a/llvm/lib/Object/MachOObjectFile.cpp
+++ b/llvm/lib/Object/MachOObjectFile.cpp
@@ -1232,6 +1232,7 @@ bool MachOObjectFile::isValidArch(StringRef ArchFlag) {
       .Case("armv5e", true)
       .Case("armv6", true)
       .Case("armv6m", true)
+      .Case("armv7", true)
       .Case("armv7em", true)
       .Case("armv7k", true)
       .Case("armv7m", true)
diff --git a/llvm/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test b/llvm/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test
index 720b78f..f741f6c 100644
--- a/llvm/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test
+++ b/llvm/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test
@@ -1,4 +1,5 @@
 @ RUN: llvm-mc < %s -triple armv7-apple-darwin -filetype=obj | llvm-objdump -m -d - | FileCheck %s
+@ RUN: llvm-mc < %s -triple armv7-apple-darwin -filetype=obj | llvm-objdump -arch armv7 -m -d - | FileCheck %s
 
 .thumb
 .thumb_func _t