X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=44c04edecd11d5c20461ec1c49aae67b7e470251;hb=712a982fd4d9bad19c8e4ba7cd5ce5a6b4f8e954;hp=fc3955b0d39dc36c2030dd144362b80b872c745b;hpb=8074abd98e7656939c28cab6a440eed48da6f9cc;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index fc3955b..44c04ed 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,22 +22,23 @@ endif
 # 	Setting the standard variables
 #
 
+HC 	   = $(GHC_INPLACE)
+MKDEPENDHS = $(GHC_INPLACE)
+
 LIBRARY = libHS$(_way).a
-HS_SRCS	= $(wildcard *.lhs)
-HS_OBJS = $(HS_SRCS:.lhs=.$(way_)o)
 LIBOBJS = $(HS_OBJS)
-HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi) PrelGHC.$(way_)hi
-
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
+SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) -fcompiling-prelude
+ifneq "$(way)" "dll"
+SRC_HC_OPTS += -static
+endif
 
-#
-# Profiling options
-WAY_p_HC_OPTS += -GPrelude
-WAY_mr_HC_OPTS += -GPrelude
+ifdef USE_REPORT_PRELUDE
+SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
+endif
 
 #
 # Object and interface files have suffixes tagged with their ways
@@ -47,28 +48,24 @@ SRC_HC_OPTS += -hisuf $(way_)hi
 endif
 
 # per-module flags
-PrelArr_HC_OPTS     += -monly-2-regs
-Directory_HC_OPTS   += -monly-3-regs 
-Time_HC_OPTS        += -monly-3-regs -H16m
+PrelArrExtra_HC_OPTS     += -monly-2-regs
 
-# Far too much heap is needed to compile PrelNum with -O at the
+# Far too much heap is needed to compile PrelNumExtra with -O at the
 # moment, but there you go..
-PrelNum_HC_OPTS     += -H30m
-# Note: this option has to go in the Makefile rather than in an
-# OPTIONS line in the source file. The reason being that we want
-# to override the SRC_HC_OPTS of -O, and anything option coming
-# from the Makefile overrides what's in OPTIONS lines. (mumble_HC_OPTS
-# does override SRC_HC_OPTS settings)
-PrelUnsafe_HC_OPTS           += -Onot
+PrelNumExtra_HC_OPTS     += -H24m -K2m
 
+PrelPack_HC_OPTS	 += -K4m
 PrelBase_HC_OPTS         += -H12m
-PrelRead_HC_OPTS         += -H13m
-PrelTup_HC_OPTS          += -H12m
+PrelRead_HC_OPTS         += -H20m
+PrelTup_HC_OPTS          += -H12m -K2m
+PrelNum_HC_OPTS		 += -H12m -K4m
 PrelArr_HC_OPTS          += -H8m
-PrelHandle_HC_OPTS       += -H12m
-Time_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
 
 #-----------------------------------------------------------------------------
 # 	Dependency generation
@@ -83,6 +80,48 @@ PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
+DLL_NAME = HSprel.dll
+DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
+DLL_IMPLIB_NAME = libHS_imp.a
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def DllVersionInfo.o
+SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHS_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
+
+ifeq "$(way)" "dll"
+HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
+endif
+
+# 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
+
+endif
+
+CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+
+#
+# Building PrelMain.dll_o is, unfortunately, somewhat tricky
+# with the current DLL setup. PrelMain.dll_o should refer to
+# all its imports bar Main.main_closure as residing in DLLs.
+# But, since the .hi's of PrelBase et al. is in the same
+# directory as PrelMain, the compiler will assume that they
+# reside in the same DLL as PrelMain & generate code accordingly.
+# 
+# So, we copy out PrelMain.lhs to ".." and build it there &
+# copy the gen'ed object file back in again.
+#
+# Note the patsubst hack (see fptools/mk/target.mk and search for
+# odir for details)
+# 
+ifeq "$(way)" "dll"
+PrelMain.dll_o : PrelMain.lhs
+	$(RM) ../PrelMain.lhs
+	$(CP) PrelMain.lhs ../
+	$(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude -split-objs, $(patsubst -odir,,$(HC_OPTS)))"
+	$(MV) ../PrelMain.dll_o .
+	$(RM) ../PrelMain.lhs ../PrelMain.dll_hi
+endif
+
 #-----------------------------------------------------------------------------
 # 	Installation; need to install .hi files as well as libraries
 #
@@ -98,11 +137,11 @@ override datadir:=$(libdir)/imports/std
 # Files to install from here
 # 
 INSTALL_LIBS  += $(LIBRARY)
-INSTALL_DATAS += $(HS_IFACES)
+ifeq "$(EnableWin32DLLs)" "YES"
+INSTALL_PROGS += $(DLL_NAME)
+INSTALL_LIBS  += $(patsubst %.a, %_imp.a, $(LIBRARY)) PrelMain.dll_o
+INSTALL_DATAS += dLL_ifs.hi
+endif
+INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
 
 include $(TOP)/mk/target.mk
-
-glaExts/PackedString_HC_OPTS += -monly-3-regs
-concurrent/Parallel_HC_OPTS  += -fglasgow-exts
-glaExts/Int_HC_OPTS          += -H8m
-glaExts/Word_HC_OPTS         += -H8m