X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FMakefile;h=9dbf2be86933d829196fc0308e0ab4d287bd0778;hb=7185a7c33692e7b8f01a6557a34d68225501e54b;hp=01fd0d87e9d6afd9df86d50af92e0a643ae8cf74;hpb=58414e5b92a8d2204c866a61fcb016098150aed1;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 01fd0d8..9dbf2be 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,16 +1,15 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.13 1999/09/16 08:35:38 sof Exp $
-
+# $Id: Makefile,v 1.31 2000/07/31 10:12:19 simonmar Exp $
+#
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
 #
-#  We create two libraries.  One, libHSrts<tag>.a, is built separately
-#  for each "way".  The other, libHSclib.a is built once: it is just
-#  .lc files that end up the same no matter what, i.e. completely
-#  ordinary C.
-
+#  .c  files are vanilla C,
+#  .hc files are "Haskellized-C", compiled using the C compiler and
+#      (possibly) the assembly-mangler.  The GHC driver script
+#      knows how to compile this stuff.
+#
 #  Other sorta independent, compile-once subdirs are:
-
 #	gmp		-- GNU multi-precision library (for Integer)
 
 #-----------------------------------------------------------------------------
@@ -19,11 +18,13 @@ TOP=..
 DoingRTS=YES
 include $(TOP)/mk/boilerplate.mk
 
+SplitObjs=NO
+
 WAYS=$(GhcLibWays)
 
-SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out gum/SysMan.c,$(wildcard gum/*.c))
+SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out parallel/SysMan.c,$(wildcard parallel/*.c))
 SRCS_RTS_S  = $(wildcard *.S)
-SRCS_RTS_HC = $(wildcard *.hc)
+SRCS_RTS_HC = $(wildcard *.hc) $(wildcard parallel/*.hc)
 
 ifneq "$(way)" "dll"
 SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
@@ -59,7 +60,7 @@ WARNING_OPTS += -optc-Wbad-function-cast
 #WARNING_OPTS += -optc-Wredundant-decls 
 #WARNING_OPTS += -optc-Wconversion
 
-SRC_HC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
+SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
 SRC_CC_OPTS = $(GhcRtsCcOpts)
 
 ifneq "$(way)" "dll"
@@ -84,7 +85,8 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 # ../driver/ghc (a better C compiler :-) to compile the
 # different RTS pieces
 #
-CC=$(HC) $(HC_OPTS) $($*_HC_OPTS)
+CC=$(GHC_INPLACE) $(HC_OPTS) $($*_HC_OPTS)
+HC=$(GHC_INPLACE)
 
 # prevent this value from leaking into the GMP makefile
 unexport CC
@@ -93,10 +95,12 @@ unexport CC
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 # 
-ifeq "$(way)" "dll"
 DLL_NAME          = HSrts.dll
+ifeq "$(way)" "dll"
 DLL_IMPLIB_NAME   = libHSrts_imp.a
-SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
+
+SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \
+                    -lHS_imp_stub -lgmp_imp
 
 #
 # Need an import library containing the symbols the RTS uses from the Prelude.
@@ -110,7 +114,7 @@ SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
 $(DLL_NAME) :: libHS_imp_stub.a
 
 libHS_imp_stub.a :
-	dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSprel.dll
+	dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll
 
 # It's not included in the DLL, but we need to compile it up separately.
 all :: Main.dll_o
@@ -125,10 +129,25 @@ endif
 
 ifneq "$(HaveLibGmp)" "YES"
 boot ::
-	cd gmp && ./configure
+	if [ ! -f gmp/configure ] ; then ( cd gmp && autoconf ); fi;
+	if [ ! -f gmp/mpn/configure ] ; then ( cd gmp/mpn && autoconf ); fi;
+	if [ ! -f gmp/mpz/configure ] ; then ( cd gmp/mpz && autoconf ); fi;
+	cd gmp && ./configure --target=$(HOSTPLATFORM)
+# Slight cheatage here to past host as target, but x-compilation isn't supported by ghc.
+
+# make sure the various configure files are included in a source dist.
+SRC_DIST_FILES += gmp/configure gmp/mpn/configure gmp/mpz/configure
 
 all :: gmp/libgmp.a
 
+ifeq "$(way)" "dll"
+all :: $(DLL_PEN)/gmp.dll
+
+$(DLL_PEN)/gmp.dll:
+	make -C gmp gmp.dll
+	mv gmp/gmp.dll $(DLL_PEN)
+endif
+
 install :: gmp/libgmp.a
 
 clean ::
@@ -148,7 +167,7 @@ endif
 #
 
 ifeq "$(way)" "mp"
-all :: gum/SysMan
+all :: parallel/SysMan
 
 ifdef solaris2_TARGET_OS
 __socket_libs = -lsocket -lnsl
@@ -156,12 +175,12 @@ else
 __socket_libs =
 endif
 
-gum/SysMan : gum/SysMan.mp_o gum/LLComms.mp_o 
+parallel/SysMan : parallel/SysMan.mp_o parallel/LLComms.mp_o RtsUtils.mp_o RtsFlags.mp_o
 	$(RM) $@
-	gcc -o $@ gum/SysMan.mp_o gum/LLComms.mp_o -L$$PVM_ROOT/lib/$$PVM_ARCH -lgpvm3 -lpvm3 $(__socket_libs)
+	gcc -o $@ parallel/SysMan.mp_o parallel/LLComms.mp_o -L$$PVM_ROOT/lib/$$PVM_ARCH -lgpvm3 -lpvm3 $(__socket_libs)
 
-CLEAN_FILES  += gum/SysMan.mp_o gum/SysMan
-INSTALL_LIBEXECS += gum/SysMan
+CLEAN_FILES  += parallel/SysMan.mp_o parallel/SysMan
+INSTALL_LIBEXECS += parallel/SysMan
 endif
 
 #-----------------------------------------------------------------------------
@@ -173,8 +192,10 @@ endif
 INSTALL_LIBS += $(LIBRARY)
 ifeq "$(EnableWin32DLLs)" "YES"
 INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
-INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
-INSTALL_LIBS += gmp/libgmp_imp.a Main.o
+ifneq "$(way)" "dll"
+INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBARY))
+endif
+INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
 endif
 
 include $(TOP)/mk/target.mk