commit 5f369036d8f099c93b3835f3aedafa71dd0f610c
author Frederic Riss <friss@apple.com> Wed Aug 26 06:41:57 2015 +0000
committer Frederic Riss <friss@apple.com> Wed Aug 26 06:41:57 2015 +0000
tree d8c8937f3ea63b7c005e2dd4ab893c49344edaed
parent 81cfed21ca8799b7100ee158d5b02fa371ba0275

Revert "[dsymutil] Emit real dSYM companion binaries."

This reverts commit r246012.
Some bots do not like it (mips/s390).

llvm-svn: 246019

llvm/tools/dsymutil/DwarfLinker.cpp

diff --git a/llvm/tools/dsymutil/DwarfLinker.cpp b/llvm/tools/dsymutil/DwarfLinker.cpp
index eece3a6..0be1237 100644
--- a/llvm/tools/dsymutil/DwarfLinker.cpp
+++ b/llvm/tools/dsymutil/DwarfLinker.cpp
@@ -10,7 +10,6 @@
 #include "BinaryHolder.h"
 #include "DebugMap.h"
 #include "dsymutil.h"
-#include "MachOUtils.h"
 #include "NonRelocatableStringpool.h"
 #include "llvm/ADT/IntervalMap.h"
 #include "llvm/ADT/StringMap.h"
@@ -476,7 +475,7 @@
   bool init(Triple TheTriple, StringRef OutputFilename);
 
   /// \brief Dump the file to the disk.
-  bool finish(const DebugMap &);
+  bool finish();
 
   AsmPrinter &getAsmPrinter() const { return *Asm; }
 
@@ -618,10 +617,7 @@
   return true;
 }
 
-bool DwarfStreamer::finish(const DebugMap &DM) {
-  if (DM.getTriple().isOSDarwin() && !DM.getBinaryPath().empty())
-    return MachOUtils::generateDsymCompanion(DM, *MS, *OutFile);
-
+bool DwarfStreamer::finish() {
   MS->Finish();
   return true;
 }
@@ -3045,7 +3041,7 @@
     Streamer->emitStrings(StringPool);
   }
 
-  return Options.NoOutput ? true : Streamer->finish(Map);
+  return Options.NoOutput ? true : Streamer->finish();
 }
 }