summaryrefslogtreecommitdiff
path: root/rts
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2017-04-17 12:56:20 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2017-04-17 12:56:31 +0100
commita92ff5d66182d992d02dfaad4c446ad074582368 (patch)
treeed086f1c65efb717cc7cc8ade62a186d719fcd4d /rts
parent29ef71412af48e1bbf7739d1dbc4c4feb3b9a86a (diff)
downloadhaskell-a92ff5d66182d992d02dfaad4c446ad074582368.tar.gz
hs_add_root() RTS API removal
Before ghc-7.2 hs_add_root() had to be used to initialize haskell modules when haskell was called from FFI. commit a52ff7619e8b7d74a9d933d922eeea49f580bca8 ("Change the way module initialisation is done (#3252, #4417)") removed needs for hs_add_root() and made function a no-op. For backward compatibility '__stginit_<module>' symbol was not removed. This change removes no-op hs_add_root() function and unused '__stginit_<module>' symbol from each haskell module. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> Test Plan: ./validate Reviewers: simonmar, austin, bgamari, erikd Reviewed By: simonmar Subscribers: rwbarton, thomie Differential Revision: https://phabricator.haskell.org/D3460
Diffstat (limited to 'rts')
-rw-r--r--rts/RtsStartup.c11
-rw-r--r--rts/RtsSymbols.c1
-rw-r--r--rts/StgStartup.cmm22
3 files changed, 0 insertions, 34 deletions
diff --git a/rts/RtsStartup.c b/rts/RtsStartup.c
index 9ec8af8145..36a99d7a56 100644
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@ -301,17 +301,6 @@ startupHaskell(int argc, char *argv[], void (*init_root)(void) STG_UNUSED)
hs_init(&argc, &argv);
}
-
-/* -----------------------------------------------------------------------------
- hs_add_root: backwards compatibility. (see #3252)
- -------------------------------------------------------------------------- */
-
-void
-hs_add_root(void (*init_root)(void) STG_UNUSED)
-{
- /* nothing */
-}
-
/* ----------------------------------------------------------------------------
* Shutting down the RTS
*
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index 7db5a27cf1..dac801d5c2 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -613,7 +613,6 @@
SymI_HasProto(hs_exit) \
SymI_HasProto(hs_exit_nowait) \
SymI_HasProto(hs_set_argv) \
- SymI_HasProto(hs_add_root) \
SymI_HasProto(hs_perform_gc) \
SymI_HasProto(hs_lock_stable_tables) \
SymI_HasProto(hs_unlock_stable_tables) \
diff --git a/rts/StgStartup.cmm b/rts/StgStartup.cmm
index 4cc84bc225..3a80e45bed 100644
--- a/rts/StgStartup.cmm
+++ b/rts/StgStartup.cmm
@@ -178,25 +178,3 @@ INFO_TABLE_RET(stg_forceIO, RET_SMALL, P_ info_ptr)
{
ENTER(ret);
}
-
-/* -----------------------------------------------------------------------------
- Special STG entry points for module registration.
- -------------------------------------------------------------------------- */
-
-stg_init_finish /* no args: explicit stack layout */
-{
- jump StgReturn [];
-}
-
-/* On entry to stg_init:
- * init_stack[0] = &stg_init_ret;
- * init_stack[1] = __stginit_Something;
- */
-stg_init /* no args: explicit stack layout */
-{
- W_ next;
- Sp = W_[BaseReg + OFFSET_StgRegTable_rSp];
- next = W_[Sp];
- Sp_adj(1);
- jump next [];
-}