separate thread_init/term from gc_init/term

Author: MartinNowak

src/gc/proxy.d

@@ -25,9 +25,6 @@ private
     static import core.memory;
     alias BlkInfo = core.memory.GC.BlkInfo;
 
-    extern (C) void thread_init();
-    extern (C) void thread_term();
-
     __gshared GC instance;
     __gshared GC proxiedGC; // used to iterate roots of Windows DLLs
 
@@ -50,10 +47,6 @@ extern (C)
             fprintf(stderr, "No GC was initialized, please recheck the name of the selected GC ('%.*s').\n", cast(int)config.gc.length, config.gc.ptr);
             exit(1);
         }
-
-        // NOTE: The GC must initialize the thread library
-        //       before its first collection.
-        thread_init();
     }
 
     void gc_term()
@@ -71,8 +64,6 @@ extern (C)
         instance.collectNoStack(); // not really a 'collect all' -- still scans
                                     // static data area, roots, and ranges.
 
-        thread_term();
-
         ManualGC.finalize(instance);
         ConservativeGC.finalize(instance);
     }

src/rt/dmain2.d

@@ -56,6 +56,8 @@ extern (C) void _d_critical_init();
 extern (C) void _d_critical_term();
 extern (C) void gc_init();
 extern (C) void gc_term();
+extern (C) void thread_init() @nogc;
+extern (C) void thread_term() @nogc;
 extern (C) void lifetime_init();
 extern (C) void rt_moduleCtor();
 extern (C) void rt_moduleTlsCtor();
@@ -190,6 +192,7 @@ extern (C) int rt_init()
         // this initializes mono time before anything else to allow usage
         // in other druntime systems.
         _d_initMonoTime();
+        thread_init();
         gc_init();
         initStaticDataGC();
         lifetime_init();
@@ -221,6 +224,7 @@ extern (C) int rt_term()
         thread_joinAll();
         rt_moduleDtor();
         gc_term();
+        thread_term();
         return 1;
     }
     catch (Throwable t)