X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=4a7b2c25e3a522b7112ea456b0378fb9cd99291a;hb=50027272414438955dbc41696541cbd25da55883;hp=4284da407eba1e54543fd7f639b8927931dc0e44;hpb=a4017b8170d4366a090921f32e0c39134f754035;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 4284da4..4a7b2c2 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,57 +22,38 @@ endif
 # 	Setting the standard variables
 #
 
-HC 	   = $(GHC_INPLACE)
-MKDEPENDHS = $(GHC_INPLACE)
+HC = $(GHC_INPLACE)
 
-ifneq "$(way)" "dll"
+ifneq "$(DLLized)" "YES"
 PACKAGE = -package-name std
 else
 # 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
-LIBRARY = libHSstd$(_way).a
 
-LIBOBJS = $(HS_OBJS)
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-LIBOBJS = $(filter-out PrelHugs.$(way_)o,$(HS_OBJS))
-endif
+HSLIB = std
+
+# 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 -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) $(PACKAGE)
-ifneq "$(way)" "dll"
-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     += -H24m -K2m
-
-PrelPack_HC_OPTS	 += -K4m
-PrelBase_HC_OPTS         += -H12m
-PrelRead_HC_OPTS         += -H20m
-PrelTup_HC_OPTS          += -H12m -K2m
-PrelNum_HC_OPTS		 += -H12m -K4m
-PrelArr_HC_OPTS          += -H8m
-PrelHandle_HC_OPTS       += -H20m
-Time_HC_OPTS             += -H24m -K2m
-Complex_HC_OPTS          += -H10m
-IO_HC_OPTS	         += -H12m
-List_HC_OPTS             += -H8m
-Directory_HC_OPTS        += -H8m
+# Special options
+PrelStorable_HC_OPTS = -monly-3-regs
+PrelCError_HC_OPTS = +RTS -K4m -RTS
 
 #-----------------------------------------------------------------------------
 # 	Dependency generation
@@ -82,42 +63,36 @@ 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)
 
-DLL_NAME = HSstd.dll
-DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
-DLL_IMPLIB_NAME = libHSstd_imp.a
-SRC_BLD_DLL_OPTS += --export-all --output-def=HSstd.def DllVersionInfo.o
-SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHSstd_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
-
-ifeq "$(way)" "dll"
-HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
+ifneq "$(BootingFromHc)" "YES"
+boot :: PrelPrimopWrappers.hs
+all  :: PrelPrimopWrappers.hs
 endif
 
+DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
+
+ifeq "$(DLLized)" "YES"
+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 "$(way)" "dll"
-all :: PrelMain.dll_o DllVersionInfo.o
-
+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,11 +108,10 @@ override datadir:=$(libdir)/imports/std
 #
 # Files to install from here
 # 
-INSTALL_LIBS  += $(LIBRARY)
-ifeq "$(EnableWin32DLLs)" "YES"
-INSTALL_PROGS += $(DLL_NAME)
-INSTALL_LIBS  += $(patsubst %.a, %_imp.a, $(LIBRARY)) PrelMain.dll_o
+ifeq "$(DLLized)" "YES"
+INSTALL_LIBS  += PrelMain.dll_o
 endif
-INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
+
+INSTALL_DATAS += PrelGHC.$(way_)hi
 
 include $(TOP)/mk/target.mk