X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=0857f53dd3b13edf84c094ed1021f2cd33cab521;hb=874d309255f603878dc31144c59a28d9dbca000f;hp=c577259f09251d928a797afe1dac74cbf7adfb59;hpb=bb1b92d4970d515dea33cf976402327329d42699;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index c577259..0857f53 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,8 +22,8 @@ endif
 # 	Setting the standard variables
 #
 
-HC 	   = $(GHC_INPLACE)
-MKDEPENDHS = $(GHC_INPLACE)
+HC 	 = $(GHC_INPLACE)
+CC	 = $(GHC_INPLACE)
 
 ifneq "$(DLLized)" "YES"
 PACKAGE = -package-name std
@@ -34,45 +34,27 @@ endif
 
 HSLIB = std
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-LIBOBJS = $(filter-out PrelHugs.$(way_)o,$(HS_OBJS))
-endif
+# we don't want PrelMain in the GHCi library.
+GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
+
+BOOT_SRCS += PrelPrimopWrappers.hs
+
+HSC_SRCS = $(wildcard *.hsc)
+HSC_HS   = $(patsubst %.hsc,%.hs, $(HSC_SRCS))
+HS_SRCS := $(HSC_HS) $(filter-out $(HSC_HS),$(HS_SRCS))
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fvia-C -fglasgow-exts +RTS -H16m -K4m -G3 -RTS $(GhcLibHcOpts) $(PACKAGE)
-ifneq "$(DLLized)" "YES"
-SRC_HC_OPTS += -static
-endif
+SRC_HC_OPTS += -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
 
 ifdef USE_REPORT_PRELUDE
 SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
 endif
 
-#
-# Object and interface files have suffixes tagged with their ways
-#
-ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi
-endif
-
-# Far too much heap is needed to compile PrelNumExtra with -O at the
-# moment, but there you go..
-PrelNumExtra_HC_OPTS     += +RTS -H24m -K2m -RTS
-
-PrelPack_HC_OPTS	 += +RTS -K4m -RTS
-PrelBase_HC_OPTS         += +RTS -H12m -RTS
-PrelRead_HC_OPTS         += +RTS -H20m -RTS
-PrelTup_HC_OPTS          += +RTS -H12m -K2m -RTS
-PrelNum_HC_OPTS		 += +RTS -H12m -K4m -RTS
-PrelArr_HC_OPTS          += +RTS -H8m -RTS
-PrelHandle_HC_OPTS       += +RTS -H20m -RTS
-Time_HC_OPTS             += +RTS -H24m -K2m -RTS
-Complex_HC_OPTS          += +RTS -H10m -RTS
-IO_HC_OPTS	         += +RTS -H12m -RTS
-List_HC_OPTS             += +RTS -H8m -RTS
-Directory_HC_OPTS        += +RTS -H8m -RTS
+# Special options
+PrelStorable_HC_OPTS = -monly-3-regs
+PrelCError_HC_OPTS = +RTS -K4m -RTS
 
 #-----------------------------------------------------------------------------
 # 	Dependency generation
@@ -82,37 +64,32 @@ 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
+
 PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 	cp $< $@
 
-boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+boot :: PrelPrimopWrappers.hs PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+all :: PrelPrimopWrappers.hs
 
 DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 
 ifeq "$(DLLized)" "YES"
-HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
-endif
-
+HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
 # PrelMain.dll_o isn't to be included in the final .a, 
 # but it needs to be generated
-ifeq "$(DLLized)" "YES"
 all :: PrelMain.dll_o
 endif
 
 CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
-#
-# If we're building the unregisterised way, it may well be for Hugs.
-# In that case, remember to bind the cbits objects into a single file
-# which hugs can load as an auxiliary object file when loading the Prelude.
-#
-ifeq "$(way)" "u"
-all :: libHSstd_cbits.u_o
-CLEAN_FILES += libHSstd_cbits.u_o
-libHSstd_cbits.u_o:
-	$(RM) libHSstd_cbits.u_o
-	ld -r -o libHSstd_cbits.u_o cbits/*.o
-endif
+CLEAN_FILES +=  \
+	$(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
+	$(patsubst %.hsc, %.hs.c, $(HSC_SRCS)) \
+	$(patsubst %.hsc, %.hs.h, $(HSC_SRCS))
 
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
@@ -133,8 +110,5 @@ INSTALL_LIBS  += PrelMain.dll_o
 endif
 
 INSTALL_DATAS += PrelGHC.$(way_)hi
-ifeq "$(DLLized)" "YES"
-INSTALL_DATAS := $(filter-out PrelHugs.$(way_)hi,$(INSTALL_DATAS))
-endif
 
 include $(TOP)/mk/target.mk