projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-09-04 18:29:20 by ken]
[ghc-hetmet.git]
/
ghc
/
rts
/
StgStartup.hc
diff --git
a/ghc/rts/StgStartup.hc
b/ghc/rts/StgStartup.hc
index
5949c86
..
92dc701
100644
(file)
--- a/
ghc/rts/StgStartup.hc
+++ b/
ghc/rts/StgStartup.hc
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: StgStartup.hc,v 1.13 2000/04/26 13:50:27 simonmar Exp $
+ * $Id: StgStartup.hc,v 1.16 2001/09/04 18:29:21 ken Exp $
*
* (c) The GHC Team, 1998-1999
*
*
* (c) The GHC Team, 1998-1999
*
@@
-7,6
+7,7
@@
*
* ---------------------------------------------------------------------------*/
*
* ---------------------------------------------------------------------------*/
+#include "Stg.h"
#include "Rts.h"
#include "StgRun.h" /* StgReturn */
#include "StgStartup.h"
#include "Rts.h"
#include "StgRun.h" /* StgReturn */
#include "StgStartup.h"
@@
-134,12
+135,10
@@
STGFUN(stg_enterStackTop)
Special STG entry points for module registration.
This stuff is problematic for Hugs, because it introduces a
Special STG entry points for module registration.
This stuff is problematic for Hugs, because it introduces a
- dependency between the RTS and the program (ie. __init_PrelMain). So
+ dependency between the RTS and the program (ie. __stginit_PrelMain). So
we currently disable module initialisation for Hugs.
-------------------------------------------------------------------------- */
we currently disable module initialisation for Hugs.
-------------------------------------------------------------------------- */
-#ifndef INTERPRETER
-
extern F_ *init_stack;
STGFUN(stg_init_ret)
extern F_ *init_stack;
STGFUN(stg_init_ret)
@@
-151,7
+150,7
@@
STGFUN(stg_init_ret)
/* On entry to stg_init:
* init_stack[0] = &stg_init_ret;
/* On entry to stg_init:
* init_stack[0] = &stg_init_ret;
- * init_stack[1] = __init_Something;
+ * init_stack[1] = __stginit_Something;
*/
STGFUN(stg_init)
{
*/
STGFUN(stg_init)
{
@@
-163,7
+162,5
@@
STGFUN(stg_init)
/* PrelGHC doesn't really exist... */
/* PrelGHC doesn't really exist... */
-START_MOD_INIT(__init_PrelGHC);
+START_MOD_INIT(__stginit_PrelGHC);
END_MOD_INIT();
END_MOD_INIT();
-
-#endif /* !INTERPRETER */