Commit 6ef2b1ef authored by Simon Marlow's avatar Simon Marlow

FIX BUILD (bootstrap with -fvia-C): prototype fixes

parent 4c6a3f78
......@@ -48,8 +48,12 @@ RTS_RET_INFO(stg_catch_stm_frame_info);
RTS_ENTRY(stg_upd_frame_ret);
RTS_ENTRY(stg_marked_upd_frame_ret);
/* Entry code for constructors created by the bytecode interpreter */
RTS_FUN(stg_interp_constr_entry);
// RTS_FUN(stg_interp_constr_entry);
//
// This is referenced using the FFI in the compiler (ByteCodeItbls),
// so we can't give it the correct type here because the prototypes
// would clash (FFI references are always declared with type StgWord[]
// in the generated C code).
/* Magic glue code for when compiled code returns a value in R1/F1/D1
or a VoidRep to the interpreter. */
......@@ -495,10 +499,6 @@ RTS_FUN(stg_init);
RTS_FUN(StgReturn);
extern int rts_stop_next_breakpoint;
extern int rts_stop_on_exception;
extern void *rts_breakpoint_io_action;
/* -----------------------------------------------------------------------------
PrimOps
-------------------------------------------------------------------------- */
......@@ -605,9 +605,15 @@ RTS_FUN(getApStackValzh_fast);
RTS_FUN(noDuplicatezh_fast);
/* Other misc stuff */
// See wiki:Commentary/Compiler/Backends/PprC#Prototypes
#if IN_STG_CODE && !IN_STGCRUN
// Interpreter.c
extern StgWord rts_stop_next_breakpoint[];
extern StgWord rts_stop_on_exception[];
extern StgWord rts_breakpoint_io_action[];
// Schedule.c
extern int RTS_VAR(context_switch);
extern StgWord RTS_VAR(blocked_queue_hd), RTS_VAR(blocked_queue_tl);
......
......@@ -773,15 +773,15 @@ typedef struct _RtsSymbolVal {
SymX(writeTVarzh_fast) \
SymX(xorIntegerzh_fast) \
SymX(yieldzh_fast) \
SymX(stg_interp_constr_entry) \
Sym(stg_interp_constr_entry) \
SymX(allocateExec) \
SymX(freeExec) \
SymX(getAllocations) \
SymX(revertCAFs) \
SymX(RtsFlags) \
SymX(rts_breakpoint_io_action) \
SymX(rts_stop_next_breakpoint) \
SymX(rts_stop_on_exception) \
Sym(rts_breakpoint_io_action) \
Sym(rts_stop_next_breakpoint) \
Sym(rts_stop_on_exception) \
SymX(stopTimer) \
SymX(n_capabilities) \
RTS_USER_SIGNALS_SYMBOLS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment