From 37c67e6bb60a8ea1ff4dfa9ca6697fc64bc9b96d Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Tue, 16 Jun 2015 17:37:03 +0000 Subject: [PATCH] Have MachOObjectFile::isValidArch() accept armv7 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239833 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Object/MachOObjectFile.cpp | 1 + test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index d02ca48a7d1..adb8cab056e 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/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/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test b/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test index 720b78fa89e..f741f6cb27a 100644 --- a/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test +++ b/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 -- 2.11.0