use pointer to reference InitializeRuntime method (dotnet#1285)

tonerdo · Nov 11, 2017 · 9d7df3d · 9d7df3d
1 parent 6575a65
commit 9d7df3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Native/Bootstrap/main.cpp b/src/Native/Bootstrap/main.cpp
@@ -350,7 +350,8 @@ int main(int argc, char* argv[])
     return retval;
 }
 
-extern "C" int InitializeRuntime()
+extern "C" int (*InitializeRuntimePtr)();
+int InitializeRuntime()
 {
     if (RUNTIME_INITIALIZED)
         return 0;
@@ -394,3 +395,9 @@ extern "C" int InitializeRuntime()
     return 0;
 #endif // CORERT_DLL
 }
+
+__attribute__ ((__constructor__))
+void Init()
+{
+    InitializeRuntimePtr = &InitializeRuntime;
+}
diff --git a/src/Native/Runtime/thread.cpp b/src/Native/Runtime/thread.cpp
@@ -1115,13 +1115,13 @@ FORCEINLINE bool Thread::InlineTryFastReversePInvoke(ReversePInvokeFrame * pFram
     return true;
 }
 
-extern "C" int InitializeRuntime();
-
+EXTERN_C int (*InitializeRuntimePtr)() = NULL;
 void Thread::ReversePInvokeAttachOrTrapThread(ReversePInvokeFrame * pFrame)
 {
     if (!IsStateSet(TSF_Attached))
     {
-        InitializeRuntime();
+        if (*InitializeRuntimePtr != NULL)
+            (*InitializeRuntimePtr)();
         ThreadStore::AttachCurrentThread();
     }