Merge branch 'master' of github.com:D-Programming-Language/druntime

dlang · Sep 8, 2011 · 9b87e62 · 9b87e62
2 parents b23be8d + ffb2ac3
commit 9b87e62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/rt/dmain2.d b/src/rt/dmain2.d
@@ -81,6 +81,7 @@ extern (C) void _minit();
 extern (C) void _moduleCtor();
 extern (C) void _moduleDtor();
 extern (C) void thread_joinAll();
+extern (C) void rt_lifetimeInit();
 
 version (OSX)
 {
@@ -267,6 +268,7 @@ extern (C) bool rt_init(ExceptionHandler dg = null)
         initStaticDataGC();
         version (Windows)
             _minit();
+        rt_lifetimeInit();
         _moduleCtor();
         _moduleTlsCtor();
         runModuleUnitTests();
@@ -513,6 +515,7 @@ extern (C) int main(int argc, char** argv)
         initStaticDataGC();
         version (Windows)
             _minit();
+        rt_lifetimeInit();
         _moduleCtor();
         _moduleTlsCtor();
         if (runModuleUnitTests())

diff --git a/src/rt/lifetime.d b/src/rt/lifetime.d
@@ -392,7 +392,7 @@ else
 }
 
 static __gshared size_t __blkcache_offset;
-shared static this()
+extern(C) void rt_lifetimeInit()
 {
     void[] tls = thread_getTLSBlock();
     __blkcache_offset = (cast(void *)&__blkcache_storage) - tls.ptr;