From b3eecaf19e81f0cccffdeff940afbfd1a3754af2 Mon Sep 17 00:00:00 2001
From: Jim Grosbach <grosbach@apple.com>
Date: Tue, 22 Mar 2011 18:19:42 +0000
Subject: [PATCH] Propogate the error message, not just the error state.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128094 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/ExecutionEngine/RuntimeDyld.h      | 1 +
 lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 5 +++++
 tools/llvm-rtdyld/llvm-rtdyld.cpp               | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/include/llvm/ExecutionEngine/RuntimeDyld.h b/include/llvm/ExecutionEngine/RuntimeDyld.h
index 629dccff234..2b5a6918172 100644
--- a/include/llvm/ExecutionEngine/RuntimeDyld.h
+++ b/include/llvm/ExecutionEngine/RuntimeDyld.h
@@ -38,6 +38,7 @@ public:
   // FIXME: Should be parameterized to get the memory block associated with
   // a particular loaded object.
   sys::MemoryBlock getMemoryBlock();
+  StringRef getErrorString();
 };
 
 } // end namespace llvm
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
index a57055eb8d2..aa4f2f9ad0b 100644
--- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
+++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
@@ -334,4 +334,9 @@ sys::MemoryBlock RuntimeDyld::getMemoryBlock() {
   return Dyld->getMemoryBlock();
 }
 
+StringRef RuntimeDyld::getErrorString()
+{
+  return Dyld->getErrorString();
+}
+
 } // end namespace llvm
diff --git a/tools/llvm-rtdyld/llvm-rtdyld.cpp b/tools/llvm-rtdyld/llvm-rtdyld.cpp
index 4e224261cbf..286a3f251d8 100644
--- a/tools/llvm-rtdyld/llvm-rtdyld.cpp
+++ b/tools/llvm-rtdyld/llvm-rtdyld.cpp
@@ -63,8 +63,9 @@ static int executeInput() {
   RuntimeDyld Dyld;
 
   // Load the object file into it.
-  if (Dyld.loadObject(InputBuffer.take()))
-    return true;
+  if (Dyld.loadObject(InputBuffer.take())) {
+    return Error(Dyld.getErrorString());
+  }
 
   // Get the address of "_main".
   void *MainAddress = Dyld.getSymbolAddress("_main");
-- 
2.34.1