diff options
| -rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 1 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index d02ca48a7d1..adb8cab056e 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 720b78fa89e..f741f6cb27a 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 |
