[llvm] r239833 - Have MachOObjectFile::isValidArch() accept armv7

[Frederic Riss]

Author: friss
Date: Tue Jun 16 12:37:03 2015
New Revision: 239833

URL: http://llvm.org/viewvc/llvm-project?rev=239833&view=rev
Log:
Have MachOObjectFile::isValidArch() accept armv7

Modified:
    llvm/trunk/lib/Object/MachOObjectFile.cpp
    llvm/trunk/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test

Modified: llvm/trunk/lib/Object/MachOObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/MachOObjectFile.cpp?rev=239833&r1=239832&r2=239833&view=diff
==============================================================================
--- llvm/trunk/lib/Object/MachOObjectFile.cpp (original)
+++ llvm/trunk/lib/Object/MachOObjectFile.cpp Tue Jun 16 12:37:03 2015
@@ -1232,6 +1232,7 @@ bool MachOObjectFile::isValidArch(String
       .Case("armv5e", true)
       .Case("armv6", true)
       .Case("armv6m", true)
+      .Case("armv7", true)
       .Case("armv7em", true)
       .Case("armv7k", true)
       .Case("armv7m", true)

Modified: llvm/trunk/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test?rev=239833&r1=239832&r2=239833&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test (original)
+++ llvm/trunk/test/tools/llvm-objdump/ARM/macho-arm-and-thumb.test Tue Jun 16 12:37:03 2015
@@ -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