[project @ 2002-02-12 11:44:54 by simonmar]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 2b044a4..fe93463 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -33,7 +33,8 @@ endif
 
 PACKAGE = std
 
-BOOT_SRCS += PrelPrimopWrappers.hs
+ALL_SRCS    += PrelPrimopWrappers.hs
+CLEAN_FILES += PrelPrimopWrappers.hs
 
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
@@ -57,6 +58,7 @@ PrelIO_HC_OPTS       += -fno-ignore-asserts
 # Special options
 PrelStorable_HC_OPTS = -monly-3-regs
 PrelCError_HC_OPTS   = +RTS -K4m -RTS
+PrelPArr_HC_OPTS     = -fparr
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
@@ -87,44 +89,36 @@ 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
-all :: PrelMain.dll_o
-endif
-
 CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
-
 #-----------------------------------------------------------------------------
 #      Building the library for GHCi
 #
-# The procedure differs from that in fptools/mk/target.mk in two ways:
-#  (a) we don't want PrelMain in the GHCi std library
-#  (b) on Win32 we must split it into two, because a single .o file can't
+# 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.
 #      
 
-# we don't want PrelMain in the GHCi library.
-GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
+GHCI_LIBOBJS = $(HS_OBJS)
 
 # 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)
+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))
+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
 
 
@@ -142,9 +136,6 @@ override datadir:=$(libdir)/imports/std
 #
 # Files to install from here
 # 
-ifeq "$(DLLized)" "YES"
-INSTALL_LIBS  += PrelMain.dll_o
-endif
 
 INSTALL_DATAS += PrelGHC.$(way_)hi
 
@@ -153,7 +144,6 @@ 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
@@ -180,17 +170,24 @@ ilxcheck:
 
 ifeq "$(ILXized)" "YES"
 
-SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module -DILX
+SRC_HC_OPTS += -optI--assembly-name -optIstd.$(way_)o -optI--module -DILX -keep-il-file
 
 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
+
+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 $@
 
-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 $@
+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
@@ -199,11 +196,11 @@ std.$(way_)vlb: std.dll
 
 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 $@
+       ((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)
-       ILVALID_HOME=c:\\devel\\fcom\\src\\ ILVALID_MSCORLIB=mscorlib.vlb $(ILVALID) c:\\devel\\fcom\\src\\bin\\msilxlib.vlbx  $(HS_ILX) | tee $@
+       ILSDK_HOME=c:\\devel\\fcom $(ILVALID) c:\\devel\\fcom\\bin\\msilxlib.ilo $(HS_ILX) | tee $@
 
 endif # ILXized
 
@@ -212,6 +209,3 @@ endif # ILXized
 
 
 include $(TOP)/mk/target.mk
-
-# PrelIO.hsc includes PrelHandle_hsc.h
-PrelIO.hsc : PrelHandle_hsc.h