X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=0fdeebca190f5c20899ec6ce51fe6e83708283e0;hb=ec2e177faf6ed8ff934f0bd97cf77fcb0f2210bd;hp=99eef3ab328ef72382e2243f885edee3fbb4d1ba;hpb=d50532327d205b3473492646815d4a11f7608c0b;p=ghc-hetmet.git diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index 99eef3a..0fdeebc 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -38,7 +38,8 @@ BOOT_SRCS += PrelPrimopWrappers.hs #----------------------------------------------------------------------------- # Setting the GHC compile options -SRC_HC_OPTS += -cpp -fglasgow-exts $(GhcLibHcOpts) +# -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 @@ -56,22 +57,23 @@ PrelIO_HC_OPTS += -fno-ignore-asserts # Special options PrelStorable_HC_OPTS = -monly-3-regs PrelCError_HC_OPTS = +RTS -K4m -RTS -PrelInt_HC_OPTS = -monly-3-regs -PrelWord_HC_OPTS = -monly-3-regs #----------------------------------------------------------------------------- # Dependency generation SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -SRC_MKDEPENDC_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 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 $< $@ @@ -92,7 +94,7 @@ 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) #----------------------------------------------------------------------------- @@ -109,21 +111,21 @@ 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) - +LIBOBJS=$(GHCI_LIBOBJS) else # Rule for Win32 platform # Keep HSstd.o as a pseudo-target (I think) + +# Turn off standard rule which creates HSstd.o from LIBOBJS. +DONT_WANT_STD_GHCI_LIB_RULE=YES + 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 endif # TARGETPLATFORM = i386-unknown-mingw32 - - #----------------------------------------------------------------------------- # Installation; need to install .hi files as well as libraries # @@ -151,56 +153,49 @@ INSTALL_DATAS += PrelGHC.$(way_)hi ilxstd: - $(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 + $(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 +# (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" -HS_ILX+=PrelGHC.$(hs2ilx_suffix)_o -PrelGHC.$(hs2ilx_suffix)_o: PrelGHC.ilx.real - sed -e "s/'PrelBase.dll'/'PrelBase.$(hs2ilx_suffix).dll'/g" $< > $@.tmp - mv $@.tmp $@ - -PrelGHC.$(hs2ilx_suffix)_hi : PrelGHC.hi-boot - cp $< $@ +SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module -DILX -std.$(ilx_way).dll: $(HS_MODS) - echo "call devcorb2gen free" > tmp.bat - echo "al -out:$@ $(HS_MODS)" >> tmp.bat - cmd /c tmp.bat +HS_ILX+=PrelGHC.$(way_)o +PrelGHC.$(way_)o: PrelGHC.ilx.real + sed -e "s/'PrelBase.dll'/'PrelBase.$(way_)o'/g" $< > $@.tmp + $(ILX2IL) --module --assembly-name std.$(way_)o -o $@.il $@.tmp + $(ILASM) /QUIET /DLL /OUT=$@ $@.il +# mv $@.tmp $@ -std.$(ilx_way).mvl: $(HS_IL) - ((ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).vlb $(HS_IL)) 2>&1) | tee $@ +std.$(way_)mvl: $(HS_IL) + ((ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).vlb $(HS_IL)) 2>&1) | tee $@ -std.$(ilx_way).vlb: std.$(ilx_way).dll - echo "call devcorb2gen fastchecked" > tmp.bat - echo "copy c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).dll ." >> tmp.bat - echo "copy c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).dll ." >> tmp.bat - echo "copy c:\\devel\\fcom\\src\\bin\\mkvlb.exe ." >> tmp.bat - echo ".\\mkvlb.exe -o $@.tmp std.$(ilx_way)" >> tmp.bat +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_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) ((ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib$(ilx2il_suffix).vlb $(MINI_IL)) 2>&1) | tee $@ @@ -208,8 +203,6 @@ mini.mvl: $(MINI_IL) std.$(ilx_way).mvlx: $(HS_ILX) ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib.vlbx $(HS_ILX) | tee $@ -.PRECIOUS: $(HS_MODS) $(HS_ILX) $(HS_IL) - endif # ILXized # End ILX stuff. @@ -218,3 +211,5 @@ endif # ILXized include $(TOP)/mk/target.mk +# PrelIO.hsc includes PrelHandle_hsc.h +PrelIO.hsc : PrelHandle_hsc.h