RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-12 14:06:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lli/RemoteMemoryManager.cpp: Resurrect __main stuff removed in r192504 to unbreak mingw32.

Browse Source 
llvm-svn: 193472
This commit is contained in:
NAKAMURA Takumi 2013-10-26 13:52:31 +00:00
parent c928f5557a
commit ea95c35a51
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/lli/RemoteMemoryManager.cpp
View File

@ -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;
}

2
tools/lli/RemoteMemoryManager.h
View File

@ -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);