[commit: ghc] master: Build fix for dyn way on Windows; patch from nus (c39d315)
Ian Lynagh
igloo at earth.li
Sat Feb 16 23:04:49 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/ghc
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c39d3154d39571879bc44db1121fa255d6c84569
>---------------------------------------------------------------
commit c39d3154d39571879bc44db1121fa255d6c84569
Author: Ian Lynagh <igloo at earth.li>
Date: Sat Feb 16 20:20:47 2013 +0000
Build fix for dyn way on Windows; patch from nus
>---------------------------------------------------------------
rts/Prelude.h | 1 +
rts/RtsStartup.c | 1 +
rts/Schedule.c | 2 +-
rts/win32/libHSbase.def | 1 +
4 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/rts/Prelude.h b/rts/Prelude.h
index dcd7b94..89e80a0 100644
--- a/rts/Prelude.h
+++ b/rts/Prelude.h
@@ -93,6 +93,7 @@ PRELUDE_INFO(base_GHCziStable_StablePtr_con_info);
#define runSparks_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSync_runSparks_closure)
#define ensureIOManagerIsRunning_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIO_ensureIOManagerIsRunning_closure)
+#define ioManagerCapabilitiesChanged_closure DLL_IMPORT_DATA_REF(base_GHCziConcziIO_ioManagerCapabilitiesChanged_closure)
#define runHandlers_closure DLL_IMPORT_DATA_REF(base_GHCziConcziSignal_runHandlers_closure)
#define flushStdHandles_closure DLL_IMPORT_DATA_REF(base_GHCziTopHandler_flushStdHandles_closure)
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index e83d047..7b7d488 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -207,6 +207,7 @@ hs_init_ghc(int *argc, char **argv[], RtsConfig rts_config)
getStablePtr((StgPtr)runSparks_closure);
getStablePtr((StgPtr)ensureIOManagerIsRunning_closure);
+ getStablePtr((StgPtr)ioManagerCapabilitiesChanged_closure);
#ifndef mingw32_HOST_OS
getStablePtr((StgPtr)runHandlers_closure);
#endif
diff --git a/rts/Schedule.c b/rts/Schedule.c
index f39ef96..ea779dd 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2070,7 +2070,7 @@ setNumCapabilities (nat new_n_capabilities USED_IF_THREADS)
// Notify IO manager that the number of capabilities has changed.
rts_evalIO(
&cap,
- &base_GHCziConcziIO_ioManagerCapabilitiesChanged_closure,
+ DLL_IMPORT_DATA_REF(base_GHCziConcziIO_ioManagerCapabilitiesChanged_closure),
NULL);
rts_unlock(cap);
diff --git a/rts/win32/libHSbase.def b/rts/win32/libHSbase.def
index 5dd1ce7..119237b 100644
--- a/rts/win32/libHSbase.def
+++ b/rts/win32/libHSbase.def
@@ -27,6 +27,7 @@ EXPORTS
base_GHCziPtr_FunPtr_con_info
base_GHCziConcziIO_ensureIOManagerIsRunning_closure
+ base_GHCziConcziIO_ioManagerCapabilitiesChanged_closure
base_GHCziConcziSync_runSparks_closure
base_GHCziTopHandler_flushStdHandles_closure
More information about the ghc-commits
mailing list