From 909125ad03e45cafff4d43bee6d03afef788a7e1 Mon Sep 17 00:00:00 2001
From: Frederic Riss <friss@apple.com>
Date: Tue, 25 Aug 2015 18:19:43 +0000
Subject: [PATCH] [dsymutil] Not finding any debug info is not a fatal error

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@245959 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/dsymutil/ARM/empty-map.test | 8 ++++++++
 tools/dsymutil/DwarfLinker.cpp         | 5 -----
 tools/dsymutil/dsymutil.cpp            | 4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 test/tools/dsymutil/ARM/empty-map.test

diff --git a/test/tools/dsymutil/ARM/empty-map.test b/test/tools/dsymutil/ARM/empty-map.test
new file mode 100644
index 00000000000..4cc0e5f67b5
--- /dev/null
+++ b/test/tools/dsymutil/ARM/empty-map.test
@@ -0,0 +1,8 @@
+# REQUIRES: object-emission
+# RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs -y %s -o - 2>&1 | FileCheck %s
+
+---
+triple:          'thumbv7-apple-darwin'
+...
+
+# CHECK: warning: no debug symbols in executable (-arch thumbv7)
diff --git a/tools/dsymutil/DwarfLinker.cpp b/tools/dsymutil/DwarfLinker.cpp
index b37e260e916..e2ece42d30c 100644
--- a/tools/dsymutil/DwarfLinker.cpp
+++ b/tools/dsymutil/DwarfLinker.cpp
@@ -3034,11 +3034,6 @@ DwarfLinker::loadObject(BinaryHolder &BinaryHolder, DebugMapObject &Obj,
 
 bool DwarfLinker::link(const DebugMap &Map) {
 
-  if (Map.begin() == Map.end()) {
-    errs() << "Empty debug map.\n";
-    return false;
-  }
-
   if (!createStreamer(Map.getTriple(), OutputFilename))
     return false;
 
diff --git a/tools/dsymutil/dsymutil.cpp b/tools/dsymutil/dsymutil.cpp
index 1b89ddcec20..3d9851eca7e 100644
--- a/tools/dsymutil/dsymutil.cpp
+++ b/tools/dsymutil/dsymutil.cpp
@@ -299,6 +299,10 @@ int main(int argc, char **argv) {
       if (DumpDebugMap)
         continue;
 
+      if (Map->begin() == Map->end())
+        llvm::errs() << "warning: no debug symbols in executable (-arch "
+                     << Map->getTriple().getArchName() << ")\n";
+
       std::string OutputFile = getOutputFileName(InputFile, NeedsTempFiles);
       if (OutputFile.empty() || !linkDwarf(OutputFile, *Map, Options))
         exitDsymutil(1);
-- 
2.11.0