X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=7e7acde4a9c1b9023122ea39db146a283e7f2df2;hb=90d750cd14f2fb3e86536cd03d18ff1b6b179d74;hp=7f01561b3a7c8eacb1e6eef1d62c46168fb0128c;hpb=8b1d1b8b8bfde824a6c1ac83bfbc5c8572fc217c;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 7f01561..7e7acde 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -34,11 +34,13 @@ endif
 PACKAGE = std
 
 BOOT_SRCS += PrelPrimopWrappers.hs
+CLEAN_FILES += 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
@@ -63,6 +65,11 @@ PrelCError_HC_OPTS   = +RTS -K4m -RTS
 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
@@ -103,21 +110,25 @@ CLEAN_FILES += PrelGHC.hi-boot PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)
 # we don't want PrelMain in the GHCi library.
 GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(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)
+	$(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))
-endif # TARGETPLATFORM = i386-unknown-mingw32
 
+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
 
 
 #-----------------------------------------------------------------------------
@@ -145,7 +156,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
@@ -172,20 +182,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.dll: $(HS_OBJS)
-	al -out:$@ $(HS_OBJS)
+PrelGHC.$(way_)o: PrelGHC.il
+	$(ILASM) /QUIET /DLL /OUT=$@ $<
 
-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.$(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
@@ -194,11 +208,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
 
@@ -207,6 +221,3 @@ endif # ILXized
 
 
 include $(TOP)/mk/target.mk
-
-# PrelIO.hsc includes PrelHandle_hsc.h
-PrelIO.hsc : PrelHandle_hsc.h