Revert "[dsymutil] Rewrite thumb triple names in user visible messages."

This reverts commit r245960.

Multiple bots are failing on the new test. It seemd like llvm-dsymutil exits with an error. Investigating.

llvm-svn: 245964

2 files changed, 1 insertions, 22 deletions

diff --git a/llvm/test/tools/dsymutil/ARM/empty-map.test b/llvm/test/tools/dsymutil/ARM/empty-map.test
index 54d9a35cc6e..4cc0e5f67b5 100644
--- a/llvm/test/tools/dsymutil/ARM/empty-map.test
+++ b/llvm/test/tools/dsymutil/ARM/empty-map.test
@@ -5,4 +5,4 @@
 triple:          'thumbv7-apple-darwin'
 ...
 
-# CHECK: warning: no debug symbols in executable (-arch armv7)
+# CHECK: warning: no debug symbols in executable (-arch thumbv7)
diff --git a/llvm/test/tools/dsymutil/ARM/fat-arch-name.test b/llvm/test/tools/dsymutil/ARM/fat-arch-name.test
deleted file mode 100644
index a8b7ca92c58..00000000000
--- a/llvm/test/tools/dsymutil/ARM/fat-arch-name.test
+++ /dev/null
@@ -1,21 +0,0 @@
-# REQUIRES: object-emission
-# RUN: llvm-dsymutil %p/../Inputs/fat-test.arm.dylib -o %t.dSYM -verbose 2>&1 | FileCheck %s
-
-# We detect thumb triples from the binaries, because those are the only ones
-# that are guaranteed to be able to generate a Target instance (for example
-# we would detect armv7m-apple-darwin as non-thumb triple, but you can't
-# instantiate a Target from that). In the user-visible architecture names, and
-# in the lipo invocation, we need to rewrite the thumb arch names to the arm
-# ones.
-
-# CHECK: warning: no debug symbols in executable (-arch armv7)
-
-# CHECK: warning: no debug symbols in executable (-arch armv7s)
-
-# CHECK: warning: no debug symbols in executable (-arch arm64)
-
-# CHECK: Running lipo
-# CHECK-NEXT: lipo -create
-# CHECK-SAME: -segalign armv7
-# CHECK-SAME: -segalign armv7s
-# CHECK-SAME: -segalign arm64