From 2d60c0945102e6887fcdc752a7b714546afae354 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Sat, 26 Oct 2013 13:52:31 +0000 Subject: lli/RemoteMemoryManager.cpp: Resurrect __main stuff removed in r192504 to unbreak mingw32. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193472 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/lli/RemoteMemoryManager.cpp | 16 ++++++++++++++++ tools/lli/RemoteMemoryManager.h | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'tools/lli') diff --git a/tools/lli/RemoteMemoryManager.cpp b/tools/lli/RemoteMemoryManager.cpp index 04fc40e426..f730f0984f 100644 --- a/tools/lli/RemoteMemoryManager.cpp +++ b/tools/lli/RemoteMemoryManager.cpp @@ -204,3 +204,19 @@ uint8_t *RemoteMemoryManager::allocateGlobal(uintptr_t Size, unsigned Alignment) void RemoteMemoryManager::deallocateFunctionBody(void *Body) { llvm_unreachable("Unexpected!"); } + +static int jit_noop() { + return 0; +} + +uint64_t RemoteMemoryManager::getSymbolAddress(const std::string &Name) { + // We should not invoke parent's ctors/dtors from generated main()! + // On Mingw and Cygwin, the symbol __main is resolved to + // callee's(eg. tools/lli) one, to invoke wrong duplicated ctors + // (and register wrong callee's dtors with atexit(3)). + // We expect ExecutionEngine::runStaticConstructorsDestructors() + // is called before ExecutionEngine::runFunctionAsMain() is called. + if (Name == "__main") return (uintptr_t)&jit_noop; + + return 0; +} diff --git a/tools/lli/RemoteMemoryManager.h b/tools/lli/RemoteMemoryManager.h index 5d0456f509..3368b30ed6 100644 --- a/tools/lli/RemoteMemoryManager.h +++ b/tools/lli/RemoteMemoryManager.h @@ -78,7 +78,7 @@ public: // interface does support this, but clients must provide their own // mechanism for finding remote symbol addresses. MCJIT will resolve // symbols from Modules it contains. - uint64_t getSymbolAddress(const std::string &Name) { return 0; } + uint64_t getSymbolAddress(const std::string &Name); void notifyObjectLoaded(ExecutionEngine *EE, const ObjectImage *Obj); -- cgit v1.2.3