diff options
| -rw-r--r-- | include/llvm/ExecutionEngine/RuntimeDyld.h | 1 | ||||
| -rw-r--r-- | lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 5 | ||||
| -rw-r--r-- | 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 629dccff23..2b5a691817 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 a57055eb8d..aa4f2f9ad0 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 4e224261cb..286a3f251d 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"); |