X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=fe934632c590d8d3a81df81846a9130484ad2533;hb=239e9471e104fd88ec93bf42623c3a68a496657a;hp=7ec2d63698c48097cb91ce0bef92fd8d28c87d03;hpb=6e292d7b67769d55ecf45dfbed606a5249e67d57;p=ghc-hetmet.git diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index 7ec2d63..fe93463 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -12,6 +12,7 @@ include $(TOP)/mk/boilerplate.mk WAYS=$(GhcLibWays) + ifeq "$(way)" "" SUBDIRS = cbits else @@ -22,50 +23,42 @@ endif # Setting the standard variables # -HC = $(GHC_INPLACE) -MKDEPENDHS = $(GHC_INPLACE) +HC = $(GHC_INPLACE) + +# *** 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 + +PACKAGE = std -LIBRARY = libHS$(_way).a -LIBOBJS = $(HS_OBJS) +ALL_SRCS += PrelPrimopWrappers.hs +CLEAN_FILES += PrelPrimopWrappers.hs #----------------------------------------------------------------------------- # Setting the GHC compile options -SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) -fcompiling-prelude -ifneq "$(way)" "dll" -SRC_HC_OPTS += -static -endif +# -fvia-C added because NCG still can't cope with some primops used in the standard library +SRC_HC_OPTS += -fvia-C -cpp -fglasgow-exts $(GhcLibHcOpts) +SRC_HSC2HS_OPTS += -Icbits 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 +# ESSENTIAL, for getting reasonable performance from the I/O library: +PrelIOBase_HC_OPTS = -funbox-strict-fields + +# debugging... +PrelIOBase_HC_OPTS += -fno-ignore-asserts +PrelHandle_HC_OPTS += -fno-ignore-asserts +PrelIO_HC_OPTS += -fno-ignore-asserts -# per-module flags -PrelArrExtra_HC_OPTS += -monly-2-regs - -# 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 +PrelPArr_HC_OPTS = -fparr #----------------------------------------------------------------------------- # Dependency generation @@ -73,54 +66,61 @@ Directory_HC_OPTS += -H8m SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) #----------------------------------------------------------------------------- +# Pre-processing (.pp) files +SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional +SRC_CPP_OPTS += ${GhcLibCppOpts} + +#----------------------------------------------------------------------------- # Rules +PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt + rm -f $@ + ../../utils/genprimopcode/genprimopcode --make-haskell-wrappers < $< > $@ + PrelGHC.$(way_)hi : PrelGHC.hi-boot cp $< $@ boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi) -DLL_NAME = HSprel.dll +ifneq "$(BootingFromHc)" "YES" +boot :: PrelPrimopWrappers.hs +all :: PrelPrimopWrappers.hs +endif + 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 -lHScbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits -ifeq "$(way)" "dll" -HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS)) -endif +CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi) -# 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 +#----------------------------------------------------------------------------- +# Building the library for GHCi +# +# The procedure differs from that in fptools/mk/target.mk in one way: +# (*) on Win32 we must split it into two, because a single .o file can't +# have more than 65536 relocations in it. +# -endif +GHCI_LIBOBJS = $(HS_OBJS) -CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi) +# Turn off standard rule which creates HSstd.o from LIBOBJS. +DONT_WANT_STD_GHCI_LIB_RULE=YES + +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)) + @touch HSstd.o + +INSTALL_LIBS += HSstd1.o HSstd2.o +endif # TARGETPLATFORM = i386-unknown-mingw32 -# -# 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, $(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 @@ -136,12 +136,76 @@ 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 -INSTALL_DATAS += dLL_ifs.hi -endif -INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi + +INSTALL_DATAS += PrelGHC.$(way_)hi + + + +#----------------------------------------------------------------------------- +# ILX stuff. PLEASE IGNORE THIS UNLESS YOU'RE WORKING ON GHC.NET + +ilxstd: + $(MAKE) way=i std.dll std.i_vlb +# $(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 +# $(MAKE) way=ilx-O-generic std.ilx-O.generic.dll +# $(MAKE) way=ilx-Onot-mono-traced std.ilx-Onot.mono.dll std.ilx-Onot.mono-traced.vlb +# $(MAKE) way=ilx-O-mono-traced std.ilx-O.mono.dll std.ilx-O.mono-traced.vlb +# $(MAKE) way=ilx-Onot-generic-traced std.ilx-Onot.generic-traced.dll +# $(MAKE) way=ilx-O-generic-traced std.ilx-O.generic-traced.dll +# $(MAKE) way=ilx-Onot-mono-verifiable std.ilx-Onot.mono-verifiable.dll std.ilx-Onot.mono-verifiable.vlb +# $(MAKE) way=ilx-O-mono-verifiable std.ilx-O.mono-verifiable.dll std.ilx-O.mono-verifiable.vlb + +ilxcheck: +# (cd //c/devel/fcom/src; make) +# (cd ../../compiler; make) + $(MAKE) way=ilx-Onot-mono std.ilx-Onot.mono.mvl + $(MAKE) way=ilx-O-mono std.ilx-O.mono.mvl + $(MAKE) way=ilx-Onot-mono-verifiable std.ilx-Onot.mono-verifiable.mvl + $(MAKE) way=ilx-O-mono-verifiable std.ilx-O.mono-verifiable.mvl + $(MAKE) way=ilx-Onot-mono-verifiable std.ilx-Onot.mono-verifiable.mvr + $(MAKE) way=ilx-O-mono-verifiable std.ilx-O.mono-verifiable.mvr + + +ifeq "$(ILXized)" "YES" + +SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module -DILX -keep-il-file + +HS_ILX+=PrelGHC.$(way_)o + +PrelGHC.ilx: PrelGHC.ilx.pp + $(CP) $< $@ + +PrelGHC.il: PrelGHC.ilx +# sed -e "s/'PrelBase.dll'/'PrelBase.$(way_)o'/g" $< > $@.tmp + $(ILX2IL) --module --assembly-name std.dll --add-suffix-to-assembly msilxlib --suffix-to-add .mono -o $@ $< +# mv $@.tmp $@ + +PrelGHC.$(way_)o: PrelGHC.il + $(ILASM) /QUIET /DLL /OUT=$@ $< + +std.$(way_)mvl: $(HS_IL) PrelGHC.$(way_)o + ((ILSDK_HOME=c:\\devel\\fcom $(ILVALID) c:\\devel\\fcom\\bin\\msilxlib.mono.ilo std.dll $(HS_IL)) 2>&1) | tee $@ +# .mono should be $(ilx2il_suffix), but that doesn't work at the moment + +std.$(way_)vlb: std.dll + mkvlb.exe -V -o $@.tmp std + cmd /c tmp.bat + mv $@.tmp $@ + +MINI_IL=PrelBase.ilx-Onot.mono.il Prelude.ilx-Onot.mono.il PrelGHC.ilx-Onot.mono.il PrelPrimopWrappers.ilx-Onot.mono.il PrelErr.ilx-Onot.mono.il PrelIOBase.ilx-Onot.mono.il PrelTup.ilx-Onot.mono.il PrelShow.ilx-Onot.mono.il PrelList.ilx-Onot.mono.il PrelPtr.ilx-Onot.mono.il PrelMaybe.ilx-Onot.mono.il PrelPack.ilx-Onot.mono.il PrelST.ilx-Onot.mono.il PrelByteArr.ilx-Onot.mono.il PrelArr.ilx-Onot.mono.il PrelNum.ilx-Onot.mono.il PrelEnum.ilx-Onot.mono.il PrelFloat.ilx-Onot.mono.il PrelReal.ilx-Onot.mono.il PrelConc.ilx-Onot.mono.il +mini.mvl: $(MINI_IL) + ((ILSDK_HOME=c:\\devel\\fcom $(ILVALID) c:\\devel\\fcom\\bin\\msilxlib$(ilx2il_suffix).ilo $(MINI_IL)) 2>&1) | tee $@ + + +std.$(ilx_way).mvlx: $(HS_ILX) + ILSDK_HOME=c:\\devel\\fcom $(ILVALID) c:\\devel\\fcom\\bin\\msilxlib.ilo $(HS_ILX) | tee $@ + +endif # ILXized + +# End ILX stuff. +#----------------------------------------------------------------------------- + include $(TOP)/mk/target.mk