Merge pull request #440 from JDevlieghere/cherrypick/d9466653e4ddbde5e787ac8cdbe67c1f356a5f69

[llvm/dwarfdump] Use the architecture string to filter.

Author: JDevlieghere

llvm/test/tools/llvm-dwarfdump/AArch64/arch.ll

@@ -1,6 +1,5 @@
 ; RUN: llc -O0 %s -filetype=obj -o %t.o
 ; RUN: llvm-dwarfdump -arch arm64   %t.o | FileCheck %s
-; RUN: llvm-dwarfdump -arch aarch64 %t.o | FileCheck %s
 ; RUN: llvm-dwarfdump -arch 0x0100000c %t.o | FileCheck %s
 ; CHECK: file format Mach-O arm64
 ;

llvm/test/tools/llvm-dwarfdump/filter.test

@@ -0,0 +1,4 @@
+Make sure that passing --arch armv7s only shows the armv7s slice and not the armv7 slice.
+
+RUN: llvm-dwarfdump -arch armv7s %S/../dsymutil/Inputs/fat-test.arm.dylib | FileCheck %s
+CHECK-NOT: (armv7)

llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp

@@ -271,7 +271,7 @@ static bool filterArch(ObjectFile &Obj) {
           return true;
 
       // Match as name.
-      if (MachO->getArchTriple().getArch() == Triple(Arch).getArch())
+      if (MachO->getArchTriple().getArchName() == Triple(Arch).getArchName())
         return true;
     }
   }