[project @ 2001-08-04 06:19:54 by ken]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 66f4b15..3086179 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -25,27 +25,21 @@ endif
 
 HC = $(GHC_INPLACE)
 
-ifneq "$(DLLized)" "YES"
-PACKAGE = -package-name std
-else
+# *** THIS WON'T WORK ANY MORE *** (PACKAGE is now set in fptools/mk/target.mk)
+ifeq "$(DLLized)" "YES"
 # Hack by SPJ to delay if-then-else until the pattern rule when we have $*
 PACKAGE = $(subst ~, ,$(word $(words dummy $(findstring $(notdir $*), PrelMain )), -package-name~std))
 endif
 
-HSLIB = std
-
-# we don't want PrelMain in the GHCi library.
-GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
+PACKAGE = std
 
 BOOT_SRCS += PrelPrimopWrappers.hs
 
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
-ifneq "$(ILXized)" "YES"
+SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts)
 SRC_HSC2HS_OPTS += -Icbits
-endif
 
 ifdef USE_REPORT_PRELUDE
 SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
@@ -60,10 +54,15 @@ PrelHandle_HC_OPTS   += -fno-ignore-asserts
 PrelIO_HC_OPTS       += -fno-ignore-asserts
 
 # Special options
-PrelStorable_HC_OPTS = -monly-3-regs
+# TODO: remove -H80M when the strictness analyser is working again.
+PrelStorable_HC_OPTS = -monly-3-regs -H80M
 PrelCError_HC_OPTS   = +RTS -K4m -RTS
-PrelInt_HC_OPTS      = -monly-3-regs
-PrelWord_HC_OPTS     = -monly-3-regs
+PrelInt_HC_OPTS      = -H80M # -monly-3-regs
+PrelWord_HC_OPTS     = -H80M # -monly-3-regs
+PrelFloat_HC_OPTS    = -H80M
+PrelRead_HC_OPTS     = -H80M
+PrelHandle_HC_OPTS   = -H80M
+Time_HC_OPTS         = -H80M
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
@@ -74,9 +73,8 @@ SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 #      Rules
 
 PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
-       rm -f PrelPrimopWrappers.hs
-       ../../utils/genprimopcode/genprimopcode  --make-haskell-wrappers \
-               < ../../compiler/prelude/primops.txt > PrelPrimopWrappers.hs
+       rm -f $@
+       ../../utils/genprimopcode/genprimopcode --make-haskell-wrappers < $< > $@
 
 PrelGHC.$(way_)hi      : PrelGHC.hi-boot
        cp $< $@
@@ -97,7 +95,37 @@ HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
 all :: PrelMain.dll_o
 endif
 
-CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+
+
+#-----------------------------------------------------------------------------
+#      Building the library for GHCi
+#
+# The procedure differs from that in fptools/mk/target.mk in two ways:
+#  (a) we don't want PrelMain in the GHCi std library
+#  (b) on Win32 we must split it into two, because a single .o file can't
+#      have more than 65536 relocations in it.
+#      
+
+# we don't want PrelMain in the GHCi library.
+GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
+
+
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+#              Standard rule
+HSstd.o :: $(GHCI_LIBOBJS)
+       ld -r -x -o $@ $(GHCI_LIBOBJS)
+
+else
+#              Rule for Win32 platform
+# Keep HSstd.o as a pseudo-target (I think)
+HSstd.o :: $(GHCI_LIBOBJS)
+       ld -r -x -o HSstd1.o $(filter     Prel%, $(GHCI_LIBOBJS))
+       ld -r -x -o HSstd2.o $(filter-out Prel%, $(GHCI_LIBOBJS))
+endif # TARGETPLATFORM = i386-unknown-mingw32
+
+
+
 
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
@@ -119,13 +147,13 @@ endif
 
 INSTALL_DATAS += PrelGHC.$(way_)hi
 
+
+
 #-----------------------------------------------------------------------------
 # ILX stuff.  PLEASE IGNORE THIS UNLESS YOU'RE WORKING ON GHC.NET
 
 
 ilxstd:
-       (cd //c/devel/fcom/src; make ilxsdk)
-       (cd ../../compiler; make)
        $(MAKE) way=ilx-Onot-mono std.ilx-Onot.mono.dll std.ilx-Onot.mono.vlb
        $(MAKE) way=ilx-O-mono  std.ilx-O.mono.dll std.ilx-O.mono.vlb
        $(MAKE) way=ilx-Onot-generic std.ilx-Onot.generic.dll
@@ -193,3 +221,7 @@ endif # ILXized
 
 include $(TOP)/mk/target.mk
 
+# PrelIO.hsc includes PrelHandle_hsc.h
+PrelIO.hsc : PrelHandle_hsc.h
+
+