Add explicit imports for RTS-external variables

4 files changed, 31 insertions, 4 deletions

diff --git a/rts/Exception.cmm b/rts/Exception.cmm
index a0a6db4fc7..f3564e453f 100644
--- a/rts/Exception.cmm
+++ b/rts/Exception.cmm
@@ -13,6 +13,8 @@
 #include "Cmm.h"
 #include "RaiseAsync.h"
 
+import base_GHCziBase_True_closure;
+
 /* -----------------------------------------------------------------------------
    Exception Primitives
 
diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm
index 5579e9238a..a42ba8faa6 100644
--- a/rts/HeapStackCheck.cmm
+++ b/rts/HeapStackCheck.cmm
@@ -12,6 +12,8 @@
 
 #include "Cmm.h"
 
+import pthread_mutex_unlock;
+
 /* Stack/Heap Check Failure
  * ------------------------
  *
diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index cb8626e5dd..9f05a038c8 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -27,6 +27,26 @@
 
 #include "Cmm.h"
 
+import __gmpz_init;
+import __gmpz_add;
+import __gmpz_sub;
+import __gmpz_mul;
+import __gmpz_gcd;
+import __gmpn_gcd_1;
+import __gmpn_cmp;
+import __gmpz_tdiv_q;
+import __gmpz_tdiv_r;
+import __gmpz_tdiv_qr;
+import __gmpz_fdiv_qr;
+import __gmpz_divexact;
+import __gmpz_and;
+import __gmpz_xor;
+import __gmpz_ior;
+import __gmpz_com;
+import base_GHCziIOBase_NestedAtomically_closure;
+import pthread_mutex_lock;
+import pthread_mutex_unlock;
+
 /*-----------------------------------------------------------------------------
   Array Primitives
 
diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm
index ebf9e922ae..4eb20ddfd8 100644
--- a/rts/StgMiscClosures.cmm
+++ b/rts/StgMiscClosures.cmm
@@ -12,6 +12,10 @@
 
 #include "Cmm.h"
 
+import pthread_mutex_lock;
+import base_GHCziBase_Czh_static_info;
+import base_GHCziBase_Izh_static_info;
+
 /* ----------------------------------------------------------------------------
    Support for the bytecode interpreter.
    ------------------------------------------------------------------------- */
@@ -599,10 +603,9 @@ CLOSURE(stg_dummy_ret_closure,stg_dummy_ret);
  * when we've got the real addresses to the C# and I# closures.
  *
  */
-static INFO_TBL_CONST StgInfoTable czh_static_info;
-static INFO_TBL_CONST StgInfoTable izh_static_info;
-#define Char_hash_static_info czh_static_info
-#define Int_hash_static_info izh_static_info
+#warning Is this correct? _imp is a pointer!
+#define Char_hash_static_info _imp__base_GHCziBase_Czh_static
+#define Int_hash_static_info _imp__base_GHCziBase_Izh_static
 #else
 #define Char_hash_static_info base_GHCziBase_Czh_static
 #define Int_hash_static_info base_GHCziBase_Izh_static