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

Frederic Riss via llvm-commits llvm-commits at lists.llvm.org
Tue Aug 25 11:43:12 PDT 2015


Author: friss
Date: Tue Aug 25 13:43:11 2015
New Revision: 245964

URL: http://llvm.org/viewvc/llvm-project?rev=245964&view=rev
Log:
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.

Removed:
    llvm/trunk/test/tools/dsymutil/ARM/fat-arch-name.test
Modified:
    llvm/trunk/test/tools/dsymutil/ARM/empty-map.test
    llvm/trunk/tools/dsymutil/MachOUtils.cpp
    llvm/trunk/tools/dsymutil/MachOUtils.h
    llvm/trunk/tools/dsymutil/dsymutil.cpp

Modified: llvm/trunk/test/tools/dsymutil/ARM/empty-map.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/ARM/empty-map.test?rev=245964&r1=245963&r2=245964&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/ARM/empty-map.test (original)
+++ llvm/trunk/test/tools/dsymutil/ARM/empty-map.test Tue Aug 25 13:43:11 2015
@@ -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)

Removed: llvm/trunk/test/tools/dsymutil/ARM/fat-arch-name.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/ARM/fat-arch-name.test?rev=245963&view=auto
==============================================================================
--- llvm/trunk/test/tools/dsymutil/ARM/fat-arch-name.test (original)
+++ llvm/trunk/test/tools/dsymutil/ARM/fat-arch-name.test (removed)
@@ -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

Modified: llvm/trunk/tools/dsymutil/MachOUtils.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/MachOUtils.cpp?rev=245964&r1=245963&r2=245964&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/MachOUtils.cpp (original)
+++ llvm/trunk/tools/dsymutil/MachOUtils.cpp Tue Aug 25 13:43:11 2015
@@ -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(SmallVector
 
   // 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");

Modified: llvm/trunk/tools/dsymutil/MachOUtils.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/MachOUtils.h?rev=245964&r1=245963&r2=245964&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/MachOUtils.h (original)
+++ llvm/trunk/tools/dsymutil/MachOUtils.h Tue Aug 25 13:43:11 2015
@@ -24,8 +24,6 @@ struct ArchAndFilename {
 
 bool generateUniversalBinary(SmallVectorImpl<ArchAndFilename> &ArchFiles,
                              StringRef OutputFileName, const LinkOptions &);
-
-std::string getArchName(StringRef Arch);
 }
 }
 }

Modified: llvm/trunk/tools/dsymutil/dsymutil.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/dsymutil/dsymutil.cpp?rev=245964&r1=245963&r2=245964&view=diff
==============================================================================
--- llvm/trunk/tools/dsymutil/dsymutil.cpp (original)
+++ llvm/trunk/tools/dsymutil/dsymutil.cpp Tue Aug 25 13:43:11 2015
@@ -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))




More information about the llvm-commits mailing list