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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@245964 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/dsymutil/ARM/empty-map.test b/test/tools/dsymutil/ARM/empty-map.test
index 54d9a35cc6e44ae7b40644acfa9feb3e30e811b0..4cc0e5f67b5adae0aa3cf3b9c4916043fe9db93b 100644 (file)
--- a/test/tools/dsymutil/ARM/empty-map.test
+++ b/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/test/tools/dsymutil/ARM/fat-arch-name.test b/test/tools/dsymutil/ARM/fat-arch-name.test
deleted file mode 100644 (file)
index a8b7ca9..0000000
--- a/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

diff --git a/tools/dsymutil/MachOUtils.cpp b/tools/dsymutil/MachOUtils.cpp
index 8f4d2610b8f5196610e021553df8614554aca7b8..15605fe00ebf4301ecc74f875ec3b980e4dadcc3 100644 (file)
--- a/tools/dsymutil/MachOUtils.cpp
+++ b/tools/dsymutil/MachOUtils.cpp
@@ -17,12 +17,6 @@ namespace llvm {
 namespace dsymutil {
 namespace MachOUtils {
 
-std::string getArchName(StringRef Arch) {
-  if (Arch.startswith("thumb"))
-    return (llvm::Twine("arm") + Arch.drop_front(5)).str();
-  return Arch;
-}
-
 static bool runLipo(SmallVectorImpl<const char *> &Args) {
   auto Path = sys::findProgramByName("lipo");
 
@@ -70,7 +64,6 @@ bool generateUniversalBinary(SmallVectorImpl<ArchAndFilename> &ArchFiles,
 
   // Align segments to match dsymutil-classic alignment
   for (auto &Thin : ArchFiles) {
-    Thin.Arch = getArchName(Thin.Arch);
     Args.push_back("-segalign");
     Args.push_back(Thin.Arch.c_str());
     Args.push_back("20");

diff --git a/tools/dsymutil/MachOUtils.h b/tools/dsymutil/MachOUtils.h
index d6b6f3d61c39551b600ec035773a91032f1859bb..f1b2ad9dadd1faf8ecedc9549f87998cacab93bd 100644 (file)
--- a/tools/dsymutil/MachOUtils.h
+++ b/tools/dsymutil/MachOUtils.h
@@ -24,8 +24,6 @@ struct ArchAndFilename {
 
 bool generateUniversalBinary(SmallVectorImpl<ArchAndFilename> &ArchFiles,
                              StringRef OutputFileName, const LinkOptions &);
-
-std::string getArchName(StringRef Arch);
 }
 }
 }

diff --git a/tools/dsymutil/dsymutil.cpp b/tools/dsymutil/dsymutil.cpp
index 9e112ba0727984d2953fd46fe7e21d7a8875d7fc..3d9851eca7ef491b274ef5cd8ffa9adadcaf2b37 100644 (file)
--- a/tools/dsymutil/dsymutil.cpp
+++ b/tools/dsymutil/dsymutil.cpp
@@ -301,8 +301,7 @@ int main(int argc, char **argv) {
 
       if (Map->begin() == Map->end())
         llvm::errs() << "warning: no debug symbols in executable (-arch "
-                     << MachOUtils::getArchName(Map->getTriple().getArchName())
-                     << ")\n";
+                     << Map->getTriple().getArchName() << ")\n";
 
       std::string OutputFile = getOutputFileName(InputFile, NeedsTempFiles);
       if (OutputFile.empty() || !linkDwarf(OutputFile, *Map, Options))