D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-26 16:43:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed (I hope) problem with monitor/synchronized stuff not being properly initialized on Windows.

Browse Source
This commit is contained in:
Tomas Lindquist Olsen
2008-07-27 15:03:04 +02:00
parent 5a78083c4c
commit 7a5dc3e05f
1 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tango/lib/compiler/llvmdc/dmain2.d
View File

@@ -87,13 +87,12 @@ extern (C) bool rt_trapExceptions = true;
void _d_criticalInit()
{
version (linux)
{
_STI_monitor_staticctor();
_STI_critical_init();
}
_STI_monitor_staticctor();
_STI_critical_init();
}
// this is here so users can manually initialize the runtime
// for example, when there is no main function etc.
extern (C) bool rt_init( void delegate( Exception ) dg = null )
{
_d_criticalInit();
@@ -119,13 +118,12 @@ extern (C) bool rt_init( void delegate( Exception ) dg = null )
void _d_criticalTerm()
{
version (linux)
{
_STD_critical_term();
_STD_monitor_staticdtor();
}
_STD_critical_term();
_STD_monitor_staticdtor();
}
// this is here so users can manually terminate the runtime
// for example, when there is no main function etc.
extern (C) bool rt_term( void delegate( Exception ) dg = null )
{
try
@@ -168,12 +166,9 @@ extern (C) int main(int argc, char **argv, char** env)
char[][] args;
int result;
version (linux)
{
debug(PRINTF) printf("main ctors\n");
_STI_monitor_staticctor();
_STI_critical_init();
}
debug(PRINTF) printf("main ctors\n");
_STI_monitor_staticctor();
_STI_critical_init();
debug(PRINTF) printf("main args\n");
version (Win32)
@@ -288,11 +283,9 @@ extern (C) int main(int argc, char **argv, char** env)
tryExec(&runAll);
version (linux)
{
debug(PRINTF) printf("main dtor\n");
_STD_critical_term();
_STD_monitor_staticdtor();
}
debug(PRINTF) printf("main dtor\n");
_STD_critical_term();
_STD_monitor_staticdtor();
return result;
}