6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-20 10:24:12 +00:00
Code Issues Projects Releases Wiki Activity

Provide __main hooks for cygwin & mingw32

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47479 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Anton Korobeynikov
2008-02-22 10:08:31 +00:00
parent 58d13af6f0
commit 47ccf1af3a
2 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/System/DynamicLibrary.cpp
View File

@ -118,6 +118,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
#ifdef __CYGWIN__ #ifdef __CYGWIN__
{ {
EXPLICIT_SYMBOL(_alloca); EXPLICIT_SYMBOL(_alloca);
EXPLICIT_SYMBOL(__main);
} }
#endif #endif

44
lib/System/Win32/DynamicLibrary.inc
View File

@ -44,10 +44,17 @@ static std::vector<HMODULE> OpenedHandles;
#endif #endif
extern "C" { extern "C" {
#if !defined(_MSC_VER) || _MSC_VER < 1500
static BOOL CALLBACK ELM_Callback(PSTR ModuleName, static BOOL CALLBACK ELM_Callback(PSTR ModuleName,
ModuleBaseType ModuleBase, ModuleBaseType ModuleBase,
ULONG ModuleSize, ULONG ModuleSize,
PVOID UserContext) PVOID UserContext)
#else
static BOOL CALLBACK ELM_Callback(PCSTR ModuleName,
ModuleBaseType ModuleBase,
ULONG ModuleSize,
PVOID UserContext)
#endif
{ {
// Ignore VC++ runtimes prior to 7.1. Somehow some of them get loaded // Ignore VC++ runtimes prior to 7.1. Somehow some of them get loaded
// into the process. // into the process.
@ -93,23 +100,6 @@ DynamicLibrary::~DynamicLibrary() {
} }
} }
} }
// Stack probing routines are in the support library (e.g. libgcc), but we don't
// have dynamic linking on windows. Provide a hook.
#if defined(__MINGW32__) || defined (_MSC_VER)
#define EXPLICIT_SYMBOL(SYM) \
if (!strcmp(symbolName, #SYM)) return (void*)&SYM
#define EXPLICIT_SYMBOL2(SYMFROM, SYMTO) \
if (!strcmp(symbolName, #SYMFROM)) return (void*)&SYMTO
#define EXPLICIT_SYMBOL_DEF(SYM) \
extern "C" { extern void *SYM; }
#if defined(__MINGW32__)
EXPLICIT_SYMBOL_DEF(_alloca);
#elif defined(_MSC_VER)
EXPLICIT_SYMBOL_DEF(_alloca_probe);
#endif
#endif
bool DynamicLibrary::LoadLibraryPermanently(const char *filename, bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
std::string *ErrMsg) { std::string *ErrMsg) {
@ -131,6 +121,24 @@ bool DynamicLibrary::LoadLibraryPermanently(const char *filename,
return false; return false;
} }
// Stack probing routines are in the support library (e.g. libgcc), but we don't
// have dynamic linking on windows. Provide a hook.
#if defined(__MINGW32__) || defined (_MSC_VER)
#define EXPLICIT_SYMBOL(SYM) \
if (!strcmp(symbolName, #SYM)) return (void*)&SYM
#define EXPLICIT_SYMBOL2(SYMFROM, SYMTO) \
if (!strcmp(symbolName, #SYMFROM)) return (void*)&SYMTO
#define EXPLICIT_SYMBOL_DEF(SYM) \
extern "C" { extern void *SYM; }
#if defined(__MINGW32__)
EXPLICIT_SYMBOL_DEF(_alloca);
EXPLICIT_SYMBOL_DEF(__main);
#elif defined(_MSC_VER)
EXPLICIT_SYMBOL_DEF(_alloca_probe);
#endif
#endif
void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) { void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
// First check symbols added via AddSymbol(). // First check symbols added via AddSymbol().
std::map<std::string, void *>::iterator I = g_symbols.find(symbolName); std::map<std::string, void *>::iterator I = g_symbols.find(symbolName);
@ -148,6 +156,8 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) {
#if defined(__MINGW32__) #if defined(__MINGW32__)
{ {
EXPLICIT_SYMBOL(_alloca); EXPLICIT_SYMBOL(_alloca);
EXPLICIT_SYMBOL(__main);
EXPLICIT_SYMBOL2(alloca, _alloca); EXPLICIT_SYMBOL2(alloca, _alloca);
#undef EXPLICIT_SYMBOL #undef EXPLICIT_SYMBOL
#undef EXPLICIT_SYMBOL2 #undef EXPLICIT_SYMBOL2