Add an -mattr option to the gold plugin to support subtarget features in LTO

[oota-llvm.git] / tools / lli / RemoteTargetExternal.cpp

diff --git a/tools/lli/RemoteTargetExternal.cpp b/tools/lli/RemoteTargetExternal.cpp
index 3bf7bf4e3b89d873553089a7de08757c149802e0..fe46248822c522884c0f423d7af3acbbb3a9faf8 100644 (file)
--- a/tools/lli/RemoteTargetExternal.cpp
+++ b/tools/lli/RemoteTargetExternal.cpp
@@ -26,6 +26,8 @@
 
 using namespace llvm;
 
+#define DEBUG_TYPE "lli"
+
 bool RemoteTargetExternal::allocateSpace(size_t Size, unsigned Alignment,
                                  uint64_t &Address) {
   DEBUG(dbgs() << "Message [allocate space] size: " << Size <<
@@ -111,7 +113,7 @@ bool RemoteTargetExternal::executeCode(uint64_t Address, int32_t &RetVal) {
 
 void RemoteTargetExternal::stop() {
   SendTerminate();
-  Wait();
+  RPC.Wait();
 }
 
 bool RemoteTargetExternal::SendAllocateSpace(uint32_t Alignment, uint32_t Size) {
@@ -317,9 +319,9 @@ void RemoteTargetExternal::AppendRead(void *Data, uint32_t Size) {
 }
 
 #ifdef LLVM_ON_UNIX
-#include "Unix/RemoteTargetExternal.inc"
+#include "Unix/RPCChannel.inc"
 #endif
 
 #ifdef LLVM_ON_WIN32
-#include "Windows/RemoteTargetExternal.inc"
+#include "Windows/RPCChannel.inc"
 #endif