C# has moved to ghc-prim:GHC.Types

diff --git a/rts/Prelude.h b/rts/Prelude.h
index f483650..a6f6396 100644 (file)
--- a/rts/Prelude.h
+++ b/rts/Prelude.h
@@ -44,7 +44,7 @@ PRELUDE_CLOSURE(base_ControlziException_nestedAtomically_closure);
 
 PRELUDE_CLOSURE(base_GHCziConc_ensureIOManagerIsRunning_closure);
 
-PRELUDE_INFO(base_GHCziBase_Czh_static_info);
+PRELUDE_INFO(ghczmprim_GHCziTypes_Czh_static_info);
 PRELUDE_INFO(base_GHCziBase_Izh_static_info);
 PRELUDE_INFO(base_GHCziFloat_Fzh_static_info);
 PRELUDE_INFO(base_GHCziFloat_Dzh_static_info);
@@ -60,7 +60,7 @@ PRELUDE_INFO(base_GHCziWord_W8zh_static_info);
 PRELUDE_INFO(base_GHCziWord_W16zh_static_info);
 PRELUDE_INFO(base_GHCziWord_W32zh_static_info);
 PRELUDE_INFO(base_GHCziWord_W64zh_static_info);
-PRELUDE_INFO(base_GHCziBase_Czh_con_info);
+PRELUDE_INFO(ghczmprim_GHCziTypes_Czh_con_info);
 PRELUDE_INFO(base_GHCziBase_Izh_con_info);
 PRELUDE_INFO(base_GHCziFloat_Fzh_con_info);
 PRELUDE_INFO(base_GHCziFloat_Dzh_con_info);
@@ -92,7 +92,7 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info);
 #define nonTermination_closure    DLL_IMPORT_DATA_REF(base_ControlziException_nonTermination_closure)
 #define NestedAtomically_closure  DLL_IMPORT_DATA_REF(base_ControlziException_nestedAtomically_closure)
 
-#define Czh_static_info           DLL_IMPORT_DATA_REF(base_GHCziBase_Czh_static_info)
+#define Czh_static_info           DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Czh_static_info)
 #define Fzh_static_info           DLL_IMPORT_DATA_REF(base_GHCziFloat_Fzh_static_info)
 #define Dzh_static_info           DLL_IMPORT_DATA_REF(base_GHCziFloat_Dzh_static_info)
 #define Azh_static_info           DLL_IMPORT_DATA_REF(base_Addr_Azh_static_info)
@@ -108,7 +108,7 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info);
 #define W64zh_static_info         DLL_IMPORT_DATA_REF(base_GHCziWord_W64zh_static_info)
 #define Ptr_static_info           DLL_IMPORT_DATA_REF(base_GHCziPtr_Ptr_static_info)
 #define FunPtr_static_info        DLL_IMPORT_DATA_REF(base_GHCziPtr_FunPtr_static_info)
-#define Czh_con_info              DLL_IMPORT_DATA_REF(base_GHCziBase_Czh_con_info)
+#define Czh_con_info              DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Czh_con_info)
 #define Izh_con_info              DLL_IMPORT_DATA_REF(base_GHCziBase_Izh_con_info)
 #define Fzh_con_info              DLL_IMPORT_DATA_REF(base_GHCziFloat_Fzh_con_info)
 #define Dzh_con_info              DLL_IMPORT_DATA_REF(base_GHCziFloat_Dzh_con_info)

diff --git a/rts/StgMiscClosures.cmm b/rts/StgMiscClosures.cmm
index 26c8093..205d7ac 100644 (file)
--- a/rts/StgMiscClosures.cmm
+++ b/rts/StgMiscClosures.cmm
@@ -13,7 +13,7 @@
 #include "Cmm.h"
 
 import pthread_mutex_lock;
-import base_GHCziBase_Czh_static_info;
+import ghczmprim_GHCziTypes_Czh_static_info;
 import base_GHCziBase_Izh_static_info;
 import EnterCriticalSection;
 import LeaveCriticalSection;
@@ -595,10 +595,10 @@ CLOSURE(stg_dummy_ret_closure,stg_dummy_ret);
  *
  */
 #warning Is this correct? _imp is a pointer!
-#define Char_hash_static_info _imp__base_GHCziBase_Czh_static_info
+#define Char_hash_static_info _imp__ghczmprim_GHCziTypes_Czh_static_info
 #define Int_hash_static_info _imp__base_GHCziBase_Izh_static_info
 #else
-#define Char_hash_static_info base_GHCziBase_Czh_static_info
+#define Char_hash_static_info ghczmprim_GHCziTypes_Czh_static_info
 #define Int_hash_static_info base_GHCziBase_Izh_static_info
 #endif
 

diff --git a/rts/package.conf.in b/rts/package.conf.in
index 4dd824e..57c50a3 100644 (file)
--- a/rts/package.conf.in
+++ b/rts/package.conf.in
@@ -79,7 +79,7 @@ cc-options:
 ld-options:
 #ifdef LEADING_UNDERSCORE
            "-u", "_base_GHCziBase_Izh_static_info"
-         , "-u", "_base_GHCziBase_Czh_static_info"
+         , "-u", "_ghczmprim_GHCziTypes_Czh_static_info"
          , "-u", "_base_GHCziFloat_Fzh_static_info"
          , "-u", "_base_GHCziFloat_Dzh_static_info"
          , "-u", "_base_GHCziPtr_Ptr_static_info"
@@ -94,7 +94,7 @@ ld-options:
          , "-u", "_base_GHCziWord_W64zh_static_info"
          , "-u", "_base_GHCziStable_StablePtr_static_info"
          , "-u", "_base_GHCziBase_Izh_con_info"
-         , "-u", "_base_GHCziBase_Czh_con_info"
+         , "-u", "_ghczmprim_GHCziTypes_Czh_con_info"
          , "-u", "_base_GHCziFloat_Fzh_con_info"
          , "-u", "_base_GHCziFloat_Dzh_con_info"
          , "-u", "_base_GHCziPtr_Ptr_con_info"
@@ -113,7 +113,7 @@ ld-options:
          , "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
 #else
            "-u", "base_GHCziBase_Izh_static_info"
-         , "-u", "base_GHCziBase_Czh_static_info"
+         , "-u", "ghczmprim_GHCziTypes_Czh_static_info"
          , "-u", "base_GHCziFloat_Fzh_static_info"
          , "-u", "base_GHCziFloat_Dzh_static_info"
          , "-u", "base_GHCziPtr_Ptr_static_info"
@@ -128,7 +128,7 @@ ld-options:
          , "-u", "base_GHCziWord_W64zh_static_info"
          , "-u", "base_GHCziStable_StablePtr_static_info"
          , "-u", "base_GHCziBase_Izh_con_info"
-         , "-u", "base_GHCziBase_Czh_con_info"
+         , "-u", "ghczmprim_GHCziTypes_Czh_con_info"
          , "-u", "base_GHCziFloat_Fzh_con_info"
          , "-u", "base_GHCziFloat_Dzh_con_info"
          , "-u", "base_GHCziPtr_Ptr_con_info"