Commit e5345fe3 authored by Ian Lynagh's avatar Ian Lynagh

Move Int, Float and Double into ghc-prim:GHC.Types

parent aee5e5a8
......@@ -45,9 +45,9 @@ PRELUDE_CLOSURE(base_ControlziException_nestedAtomically_closure);
PRELUDE_CLOSURE(base_GHCziConc_ensureIOManagerIsRunning_closure);
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);
PRELUDE_INFO(ghczmprim_GHCziTypes_Izh_static_info);
PRELUDE_INFO(ghczmprim_GHCziTypes_Fzh_static_info);
PRELUDE_INFO(ghczmprim_GHCziTypes_Dzh_static_info);
PRELUDE_INFO(base_Addr_Azh_static_info);
PRELUDE_INFO(base_GHCziPtr_Ptr_static_info);
PRELUDE_INFO(base_GHCziPtr_FunPtr_static_info);
......@@ -61,9 +61,9 @@ PRELUDE_INFO(base_GHCziWord_W16zh_static_info);
PRELUDE_INFO(base_GHCziWord_W32zh_static_info);
PRELUDE_INFO(base_GHCziWord_W64zh_static_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);
PRELUDE_INFO(ghczmprim_GHCziTypes_Izh_con_info);
PRELUDE_INFO(ghczmprim_GHCziTypes_Fzh_con_info);
PRELUDE_INFO(ghczmprim_GHCziTypes_Dzh_con_info);
PRELUDE_INFO(base_GHCziPtr_Ptr_con_info);
PRELUDE_INFO(base_GHCziPtr_FunPtr_con_info);
PRELUDE_INFO(base_Addr_Azh_con_info);
......@@ -93,10 +93,10 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info);
#define NestedAtomically_closure DLL_IMPORT_DATA_REF(base_ControlziException_nestedAtomically_closure)
#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 Fzh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Fzh_static_info)
#define Dzh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Dzh_static_info)
#define Azh_static_info DLL_IMPORT_DATA_REF(base_Addr_Azh_static_info)
#define Izh_static_info DLL_IMPORT_DATA_REF(base_GHCziBase_Izh_static_info)
#define Izh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Izh_static_info)
#define I8zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I8zh_static_info)
#define I16zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I16zh_static_info)
#define I32zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I32zh_static_info)
......@@ -109,9 +109,9 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_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(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)
#define Izh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Izh_con_info)
#define Fzh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Fzh_con_info)
#define Dzh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Dzh_con_info)
#define Azh_con_info DLL_IMPORT_DATA_REF(base_Addr_Azh_con_info)
#define Wzh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_Wzh_con_info)
#define W8zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W8zh_con_info)
......
......@@ -14,7 +14,7 @@
import pthread_mutex_lock;
import ghczmprim_GHCziTypes_Czh_static_info;
import base_GHCziBase_Izh_static_info;
import ghczmprim_GHCziTypes_Izh_static_info;
import EnterCriticalSection;
import LeaveCriticalSection;
......@@ -596,10 +596,10 @@ CLOSURE(stg_dummy_ret_closure,stg_dummy_ret);
*/
#warning Is this correct? _imp is a pointer!
#define Char_hash_static_info _imp__ghczmprim_GHCziTypes_Czh_static_info
#define Int_hash_static_info _imp__base_GHCziBase_Izh_static_info
#define Int_hash_static_info _imp__ghczmprim_GHCziTypes_Izh_static_info
#else
#define Char_hash_static_info ghczmprim_GHCziTypes_Czh_static_info
#define Int_hash_static_info base_GHCziBase_Izh_static_info
#define Int_hash_static_info ghczmprim_GHCziTypes_Izh_static_info
#endif
......
......@@ -78,10 +78,10 @@ cc-options:
ld-options:
#ifdef LEADING_UNDERSCORE
"-u", "_base_GHCziBase_Izh_static_info"
"-u", "_ghczmprim_GHCziTypes_Izh_static_info"
, "-u", "_ghczmprim_GHCziTypes_Czh_static_info"
, "-u", "_base_GHCziFloat_Fzh_static_info"
, "-u", "_base_GHCziFloat_Dzh_static_info"
, "-u", "_ghczmprim_GHCziTypes_Fzh_static_info"
, "-u", "_ghczmprim_GHCziTypes_Dzh_static_info"
, "-u", "_base_GHCziPtr_Ptr_static_info"
, "-u", "_base_GHCziWord_Wzh_static_info"
, "-u", "_base_GHCziInt_I8zh_static_info"
......@@ -93,10 +93,10 @@ ld-options:
, "-u", "_base_GHCziWord_W32zh_static_info"
, "-u", "_base_GHCziWord_W64zh_static_info"
, "-u", "_base_GHCziStable_StablePtr_static_info"
, "-u", "_base_GHCziBase_Izh_con_info"
, "-u", "_ghczmprim_GHCziTypes_Izh_con_info"
, "-u", "_ghczmprim_GHCziTypes_Czh_con_info"
, "-u", "_base_GHCziFloat_Fzh_con_info"
, "-u", "_base_GHCziFloat_Dzh_con_info"
, "-u", "_ghczmprim_GHCziTypes_Fzh_con_info"
, "-u", "_ghczmprim_GHCziTypes_Dzh_con_info"
, "-u", "_base_GHCziPtr_Ptr_con_info"
, "-u", "_base_GHCziPtr_FunPtr_con_info"
, "-u", "_base_GHCziStable_StablePtr_con_info"
......@@ -112,10 +112,10 @@ ld-options:
, "-u", "_base_ControlziException_nestedAtomically_closure"
, "-u", "_base_GHCziWeak_runFinalizzerBatch_closure"
#else
"-u", "base_GHCziBase_Izh_static_info"
"-u", "ghczmprim_GHCziTypes_Izh_static_info"
, "-u", "ghczmprim_GHCziTypes_Czh_static_info"
, "-u", "base_GHCziFloat_Fzh_static_info"
, "-u", "base_GHCziFloat_Dzh_static_info"
, "-u", "ghczmprim_GHCziTypes_Fzh_static_info"
, "-u", "ghczmprim_GHCziTypes_Dzh_static_info"
, "-u", "base_GHCziPtr_Ptr_static_info"
, "-u", "base_GHCziWord_Wzh_static_info"
, "-u", "base_GHCziInt_I8zh_static_info"
......@@ -127,10 +127,10 @@ ld-options:
, "-u", "base_GHCziWord_W32zh_static_info"
, "-u", "base_GHCziWord_W64zh_static_info"
, "-u", "base_GHCziStable_StablePtr_static_info"
, "-u", "base_GHCziBase_Izh_con_info"
, "-u", "ghczmprim_GHCziTypes_Izh_con_info"
, "-u", "ghczmprim_GHCziTypes_Czh_con_info"
, "-u", "base_GHCziFloat_Fzh_con_info"
, "-u", "base_GHCziFloat_Dzh_con_info"
, "-u", "ghczmprim_GHCziTypes_Fzh_con_info"
, "-u", "ghczmprim_GHCziTypes_Dzh_con_info"
, "-u", "base_GHCziPtr_Ptr_con_info"
, "-u", "base_GHCziPtr_FunPtr_con_info"
, "-u", "base_GHCziStable_StablePtr_con_info"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment