Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f906b919895fed2ec4e8f2491e60788c72a4bc84 >--------------------------------------------------------------- commit f906b919895fed2ec4e8f2491e60788c72a4bc84 Author: Ian Lynagh <[email protected]> Date: Mon May 21 23:20:22 2012 +0100 Follow the move of the Word type to ghc-prim >--------------------------------------------------------------- compiler/prelude/PrelNames.lhs | 6 +++--- rts/Prelude.h | 8 ++++---- rts/package.conf.in | 4 ++-- rts/win32/libHSbase.def | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index 7c01de1..bc76c77 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -540,7 +540,7 @@ unpackCStringUtf8_RDR = nameRdrName unpackCStringUtf8Name newStablePtr_RDR, wordDataCon_RDR :: RdrName newStablePtr_RDR = nameRdrName newStablePtrName -wordDataCon_RDR = dataQual_RDR gHC_WORD (fsLit "W#") +wordDataCon_RDR = dataQual_RDR gHC_TYPES (fsLit "W#") bindIO_RDR, returnIO_RDR :: RdrName bindIO_RDR = nameRdrName bindIOName @@ -1008,8 +1008,8 @@ word8TyConName = tcQual gHC_WORD (fsLit "Word8") word8TyConKey word16TyConName = tcQual gHC_WORD (fsLit "Word16") word16TyConKey word32TyConName = tcQual gHC_WORD (fsLit "Word32") word32TyConKey word64TyConName = tcQual gHC_WORD (fsLit "Word64") word64TyConKey -wordTyConName = tcQual gHC_WORD (fsLit "Word") wordTyConKey -wordDataConName = conName gHC_WORD (fsLit "W#") wordDataConKey +wordTyConName = tcQual gHC_TYPES (fsLit "Word") wordTyConKey +wordDataConName = conName gHC_TYPES (fsLit "W#") wordDataConKey -- PrelPtr module ptrTyConName, funPtrTyConName :: Name diff --git a/rts/Prelude.h b/rts/Prelude.h index 618cd95..e0b87e0 100644 --- a/rts/Prelude.h +++ b/rts/Prelude.h @@ -60,7 +60,7 @@ PRELUDE_INFO(base_GHCziInt_I8zh_static_info); PRELUDE_INFO(base_GHCziInt_I16zh_static_info); PRELUDE_INFO(base_GHCziInt_I32zh_static_info); PRELUDE_INFO(base_GHCziInt_I64zh_static_info); -PRELUDE_INFO(base_GHCziWord_Wzh_static_info); +PRELUDE_INFO(ghczmprim_GHCziTypes_Wzh_static_info); PRELUDE_INFO(base_GHCziWord_W8zh_static_info); PRELUDE_INFO(base_GHCziWord_W16zh_static_info); PRELUDE_INFO(base_GHCziWord_W32zh_static_info); @@ -72,7 +72,7 @@ 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); -PRELUDE_INFO(base_GHCziWord_Wzh_con_info); +PRELUDE_INFO(ghczmprim_GHCziTypes_Wzh_con_info); PRELUDE_INFO(base_GHCziInt_I8zh_con_info); PRELUDE_INFO(base_GHCziInt_I16zh_con_info); PRELUDE_INFO(base_GHCziInt_I32zh_con_info); @@ -112,7 +112,7 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_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) #define I64zh_static_info DLL_IMPORT_DATA_REF(base_GHCziInt_I64zh_static_info) -#define Wzh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_Wzh_static_info) +#define Wzh_static_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Wzh_static_info) #define W8zh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_W8zh_static_info) #define W16zh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_W16zh_static_info) #define W32zh_static_info DLL_IMPORT_DATA_REF(base_GHCziWord_W32zh_static_info) @@ -124,7 +124,7 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_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 Wzh_con_info DLL_IMPORT_DATA_REF(ghczmprim_GHCziTypes_Wzh_con_info) #define W8zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W8zh_con_info) #define W16zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W16zh_con_info) #define W32zh_con_info DLL_IMPORT_DATA_REF(base_GHCziWord_W32zh_con_info) diff --git a/rts/package.conf.in b/rts/package.conf.in index baef23e..727b586 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -67,7 +67,7 @@ ld-options: , "-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", "_ghczmprim_GHCziTypes_Wzh_static_info" , "-u", "_base_GHCziInt_I8zh_static_info" , "-u", "_base_GHCziInt_I16zh_static_info" , "-u", "_base_GHCziInt_I32zh_static_info" @@ -106,7 +106,7 @@ ld-options: , "-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", "ghczmprim_GHCziTypes_Wzh_static_info" , "-u", "base_GHCziInt_I8zh_static_info" , "-u", "base_GHCziInt_I16zh_static_info" , "-u", "base_GHCziInt_I32zh_static_info" diff --git a/rts/win32/libHSbase.def b/rts/win32/libHSbase.def index c98c2e9..5dd1ce7 100644 --- a/rts/win32/libHSbase.def +++ b/rts/win32/libHSbase.def @@ -8,7 +8,6 @@ EXPORTS base_GHCziInt_I32zh_con_info base_GHCziInt_I64zh_con_info - base_GHCziWord_Wzh_con_info base_GHCziWord_W8zh_con_info base_GHCziWord_W16zh_con_info base_GHCziWord_W32zh_con_info _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
