[project @ 1996-01-11 14:06:51 by partain]

[ghc-hetmet.git] / ghc / runtime / Jmakefile

diff --git a/ghc/runtime/Jmakefile b/ghc/runtime/Jmakefile
index ea1edaf..84e3897 100644 (file)
--- a/ghc/runtime/Jmakefile
+++ b/ghc/runtime/Jmakefile
@@ -48,14 +48,7 @@ strictly speaking), it will probably work -- it is pinned onto
 GHC_OPTS, just for fun.
 */
 
-#if i386_TARGET_ARCH
-# define __plat_specific -mtoggle-sp-mangling
-#else
-# define __plat_specific /*none*/
-#endif
-
-GHC_OPTS = -O2-for-C -optc-DFORCE_GC \
-          __plat_specific $(EXTRA_HC_OPTS)
+GHC_OPTS = -O2-for-C $(EXTRA_HC_OPTS)
 
 /* per-build options: shared with libraries */
 #define rts_or_lib(r,l) r
@@ -97,13 +90,13 @@ RTS_LC =                            \
        gum/Unpack.lc                   \
        main/GranSim.lc                 \
        main/Itimer.lc                  \
-       main/RednCounts.lc              \
+       main/Ticky.lc                   \
        main/SMRep.lc                   \
        main/Select.lc                  \
        main/Signals.lc                 \
        main/StgOverflow.lc             \
-       main/StgTrace.lc                \
        main/Threads.lc                 \
+       main/RtsFlags.lc                \
        main/main.lc                    \
        prims/PrimArith.lc              \
        prims/PrimMisc.lc               \
@@ -111,9 +104,7 @@ RTS_LC =                            \
        profiling/Hashing.lc            \
        profiling/HeapProfile.lc        \
        profiling/Indexing.lc           \
-       profiling/LifeProfile.lc        \
        profiling/Timer.lc              \
-       storage/Force_GC.lc             \
        storage/SM1s.lc                 \
        storage/SM2s.lc                 \
        storage/SMap.lc                 \
@@ -190,8 +181,8 @@ CLIB_LC =                           \
        io/toLocalTime.lc               \
        io/toUTCTime.lc                 \
        io/writeFile.lc                 \
-       prims/ByteOps.lc                \
-       storage/SMalloc.lc __readline_cfile
+       main/Mallocs.lc                 \
+       prims/ByteOps.lc __readline_cfile
 
 H_FILES = $(RTS_LH:.lh=.h)
 C_FILES = $(RTS_LC:.lc=.c) $(RTS_LHC:.lhc=.hc) $(CLIB_LC:.lc=.c)
@@ -240,6 +231,8 @@ RTS_OBJS_l    = $(RTS_LC:.lc=_l.o)  $(RTS_LHC:.lhc=_l.o)
 RTS_OBJS_m    = $(RTS_LC:.lc=_m.o)  $(RTS_LHC:.lhc=_m.o)
 RTS_OBJS_n    = $(RTS_LC:.lc=_n.o)  $(RTS_LHC:.lhc=_n.o)
 RTS_OBJS_o    = $(RTS_LC:.lc=_o.o)  $(RTS_LHC:.lhc=_o.o)
+RTS_OBJS_A    = $(RTS_LC:.lc=_A.o)  $(RTS_LHC:.lhc=_A.o)
+RTS_OBJS_B    = $(RTS_LC:.lc=_B.o)  $(RTS_LHC:.lhc=_B.o)
 
 CLIB_OBJS     = $(CLIB_LC:.lc=.o)
 
@@ -303,10 +296,10 @@ CompileClibishly(io/toClockSec,)
 CompileClibishly(io/toLocalTime,)
 CompileClibishly(io/toUTCTime,)
 CompileClibishly(io/writeFile,)
+CompileClibishly(main/Mallocs,)
 CompileClibishly(main/TopClosure,)     /* NB */
 CompileClibishly(main/TopClosure13,)   /* ditto */
 CompileClibishly(prims/ByteOps,)
-CompileClibishly(storage/SMalloc,)
 #if GhcWithReadline == YES
 CompileClibishly(io/ghcReadline,)
 #endif
@@ -327,9 +320,9 @@ install :: main/TopClosure.o main/TopClosure13.o
 # endif
 
 AllTarget(gum/SysMan)
-gum/SysMan : gum/SysMan_mp.o gum/LLComms_mp.o
+gum/SysMan : gum/SysMan_mp.o gum/LLComms_mp.o main/Mallocs.o hooks/OutOfVM.o
        $(RM) $@
-       $(CC) gum/SysMan_mp.o gum/LLComms_mp.o -o $@ -L$$PVM_ROOT/lib/$$PVM_ARCH -lpvm3 -lgpvm3 __socket_libs
+       $(CC) -o $@ gum/SysMan_mp.o gum/LLComms_mp.o main/Mallocs.o hooks/OutOfVM.o -L$$PVM_ROOT/lib/$$PVM_ARCH -lpvm3 -lgpvm3 __socket_libs
 ExtraStuffToClean(gum/SysMan_mp.o gum/SysMan)
 # if DoInstallGHCSystem == YES
 install :: gum/SysMan
@@ -409,6 +402,8 @@ IfGhcBuild_l(BigBuildTarget(_l,   $(RTS_OBJS_l)))
 IfGhcBuild_m(BigBuildTarget(_m,   $(RTS_OBJS_m)))
 IfGhcBuild_n(BigBuildTarget(_n,   $(RTS_OBJS_n)))
 IfGhcBuild_o(BigBuildTarget(_o,   $(RTS_OBJS_o)))
+IfGhcBuild_A(BigBuildTarget(_A,   $(RTS_OBJS_A)))
+IfGhcBuild_B(BigBuildTarget(_B,   $(RTS_OBJS_B)))
 
 
 /****************************************************************
@@ -449,19 +444,21 @@ IfGhcBuild_k(DoRtsFile(file,isuf,_k,   flags $(GHC_OPTS_k)))      \
 IfGhcBuild_l(DoRtsFile(file,isuf,_l,   flags $(GHC_OPTS_l)))   \
 IfGhcBuild_m(DoRtsFile(file,isuf,_m,   flags $(GHC_OPTS_m)))   \
 IfGhcBuild_n(DoRtsFile(file,isuf,_n,   flags $(GHC_OPTS_n)))   \
-IfGhcBuild_o(DoRtsFile(file,isuf,_o,   flags $(GHC_OPTS_o)))
+IfGhcBuild_o(DoRtsFile(file,isuf,_o,   flags $(GHC_OPTS_o)))   \
+IfGhcBuild_A(DoRtsFile(file,isuf,_A,   flags $(GHC_OPTS_A)))   \
+IfGhcBuild_B(DoRtsFile(file,isuf,_B,   flags $(GHC_OPTS_B)))
 
 /* here we go: */
 
 CompileRTSishly(c-as-asm/CallWrap_C,.c,)
 CompileRTSishly(c-as-asm/FreeMallocPtr,.c,)
 CompileRTSishly(c-as-asm/HpOverflow,.c,)
-CompileRTSishly(c-as-asm/PerformIO,.hc,-mtoggle-sp-mangling/*toggle it back*/)
+CompileRTSishly(c-as-asm/PerformIO,.hc,-optcO-DIN_GHC_RTS=1)
 CompileRTSishly(c-as-asm/StablePtr,.c,)
 CompileRTSishly(c-as-asm/StablePtrOps,.c,)
 CompileRTSishly(c-as-asm/StgDebug,.c,)
 CompileRTSishly(c-as-asm/StgMiniInt,.c,)
-CompileRTSishly(gum/FetchMe,.hc,-mtoggle-sp-mangling/*toggle it back*/)
+CompileRTSishly(gum/FetchMe,.hc,-optcO-DIN_GHC_RTS=1)
 CompileRTSishly(gum/GlobAddr,.c,)
 CompileRTSishly(gum/HLComms,.c,)
 CompileRTSishly(gum/Hash,.c,)
@@ -474,26 +471,24 @@ CompileRTSishly(gum/SysMan,.c,) /* NB: not in library */
 CompileRTSishly(gum/Unpack,.c,)
 CompileRTSishly(main/GranSim,.c,)
 CompileRTSishly(main/Itimer,.c,)
-CompileRTSishly(main/RednCounts,.c,)
+CompileRTSishly(main/Ticky,.c,)
 CompileRTSishly(main/SMRep,.c,)
 CompileRTSishly(main/Select,.c,)
 CompileRTSishly(main/Signals,.c,)
 CompileRTSishly(main/StgOverflow,.c,)
-CompileRTSishly(main/StgStartup,.hc,-mtoggle-sp-mangling/*toggle it back*/)
-CompileRTSishly(main/StgThreads,.hc,-mtoggle-sp-mangling/*toggle it back*/)
-CompileRTSishly(main/StgTrace,.c,)
-CompileRTSishly(main/StgUpdate,.hc,-mtoggle-sp-mangling/*toggle it back*/)
+CompileRTSishly(main/StgStartup,.hc,-optcO-DIN_GHC_RTS=1)
+CompileRTSishly(main/StgThreads,.hc,-optcO-DIN_GHC_RTS=1)
+CompileRTSishly(main/StgUpdate,.hc,-optcO-DIN_GHC_RTS=1)
 CompileRTSishly(main/Threads,.c,)
+CompileRTSishly(main/RtsFlags,.c,)
 CompileRTSishly(main/main,.c,)
 CompileRTSishly(profiling/CostCentre,.c,)
 CompileRTSishly(profiling/Hashing,.c,)
 CompileRTSishly(profiling/HeapProfile,.c,)
 CompileRTSishly(profiling/Indexing,.c,)
-CompileRTSishly(profiling/LifeProfile,.c,)
 CompileRTSishly(profiling/Timer,.c,)
 CompileRTSishly(prims/PrimArith,.c,)
 CompileRTSishly(prims/PrimMisc,.c,)
-CompileRTSishly(storage/Force_GC,.c,)
 CompileRTSishly(storage/SM1s,.c,)
 CompileRTSishly(storage/SM2s,.c,)
 CompileRTSishly(storage/SMap,.c,)
@@ -505,7 +500,7 @@ CompileRTSishly(storage/SMevac,.c,)
 CompileRTSishly(storage/SMextn,.c,)
 CompileRTSishly(storage/SMgen,.c,)
 CompileRTSishly(storage/SMinit,.c,)
-CompileRTSishly(storage/SMmark,.hc,-optc-DMARK_REG_MAP)
+CompileRTSishly(storage/SMmark,.hc,-optcO-DIN_GHC_RTS=1 -optc-DMARK_REG_MAP)
 CompileRTSishly(storage/SMmarking,.c,)
 CompileRTSishly(storage/SMscan,.c,)
 CompileRTSishly(storage/SMscav,.c,)