diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-11-06 14:05:27 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-11-06 14:05:27 +0000 |
| commit | c3685050fd288d928c4e26fb2e43fc33e304391c (patch) | |
| tree | cea68c62071287793c4b76000f779f5b97b58d51 /rts/package.conf.in | |
| parent | 3035c581282adb24ae1f63c5bc970cfa5c2292ce (diff) | |
| download | haskell-c3685050fd288d928c4e26fb2e43fc33e304391c.tar.gz | |
Rollback #1185 fix
As far as I can tell, the hack I was using in rts/Linker.c won't work
on OS X. Back to the drawing board.
rolling back:
Tue Nov 3 16:05:47 GMT 2009 Simon Marlow <marlowsd@gmail.com>
* Fix #1185 (RTS part, also needs corresponding change to libraries/base)
GHC.Conc.ensureIOManagerIsRunning now creates an IO manager thread if
one does not exist or has died/exited.
Unfortunately this exposed a problem caused by the fact that we have
two base packages, and hence two IO managers, in GHCi: see NOTE
[io-manager-ghci] in rts/Linker.c. The workaround can go away if/when
we switch to a dynamically linked GHCi.
M ./rts/Linker.c -6 +47
M ./rts/Schedule.c +4
M ./rts/package.conf.in +16
M ./rts/posix/Signals.c -1 +7
M ./rts/posix/Signals.h +2
Wed Nov 4 10:11:03 GMT 2009 Simon Marlow <marlowsd@gmail.com>
* hopefully fix validate breakage on OS X and Windows
M ./rts/Linker.c -1 +1
Wed Nov 4 16:27:40 GMT 2009 Simon Marlow <marlowsd@gmail.com>
* fix build failure on Windows
M ./rts/Linker.c -1 +1
Diffstat (limited to 'rts/package.conf.in')
| -rw-r--r-- | rts/package.conf.in | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/rts/package.conf.in b/rts/package.conf.in index 131f1e389b..087a7e9d66 100644 --- a/rts/package.conf.in +++ b/rts/package.conf.in @@ -99,14 +99,6 @@ ld-options: , "-u", "_base_GHCziConc_ensureIOManagerIsRunning_closure" , "-u", "_base_GHCziConc_runSparks_closure" , "-u", "_base_GHCziConc_runHandlers_closure" - , "-u", "_base_GHCziConc_pendingDelays_closure" - , "-u", "_base_GHCziConc_pendingEvents_closure" - , "-u", "_base_GHCziConc_ioManagerThread_closure" -#if !defined(mingw32_HOST_OS) - , "-u", "_base_GHCziConc_prodding_closure" - , "-u", "_base_GHCziConc_sync_closure" - , "-u", "_base_GHCziConc_stick_closure" -#endif #else "-u", "ghczmprim_GHCziTypes_Izh_static_info" , "-u", "ghczmprim_GHCziTypes_Czh_static_info" @@ -145,14 +137,6 @@ ld-options: , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure" , "-u", "base_GHCziConc_runSparks_closure" , "-u", "base_GHCziConc_runHandlers_closure" - , "-u", "base_GHCziConc_pendingDelays_closure" - , "-u", "base_GHCziConc_pendingEvents_closure" - , "-u", "base_GHCziConc_ioManagerThread_closure" -#if !defined(mingw32_HOST_OS) - , "-u", "base_GHCziConc_prodding_closure" - , "-u", "base_GHCziConc_sync_closure" - , "-u", "base_GHCziConc_stick_closure" -#endif #endif /* Pick up static libraries in preference over dynamic if in earlier search |