X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=6cb4e0a32e54d53e479d025ef0ef6ed56b50732b;hb=50027272414438955dbc41696541cbd25da55883;hp=d6e489972980196f1a958c0a9dd58928a92f7951;hpb=f1696a9df009542ef44c05cbe15faf7e93fa3d5c;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index d6e4899..6cb4e0a 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,16 +1,15 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.12 1999/06/29 14:18:14 simonmar Exp $
-
+# $Id: Makefile,v 1.44 2001/03/23 16:36:21 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,20 +18,27 @@ 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 "$(DLLized)" "YES"
+SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
+else
+SRCS_RTS_C  := $(filter-out Main.c, $(SRCS_RTS_C))
+endif
 
-#-----------------------------------------------------------------------------
-# creating and installing libHSrts.a (in its many flavors)
-#
-LIBRARY = libHSrts$(_way).a
 LIBOBJS = $(patsubst %.c,%.$(way_)o,$(SRCS_RTS_C)) \
           $(patsubst %.hc,%.$(way_)o,$(SRCS_RTS_HC)) \
           $(patsubst %.S,%.$(way_)o,$(SRCS_RTS_S))
 
+#-----------------------------------------------------------------------------
+# Flags for compiling RTS .c and .hc files
+
 # gcc provides lots of useful warnings if you ask it.
 # This is a pretty good list to start with - use a # to comment out
 # any you don't like.
@@ -43,7 +49,7 @@ WARNING_OPTS += -optc-Wmissing-prototypes
 WARNING_OPTS += -optc-Wmissing-declarations
 WARNING_OPTS += -optc-Winline
 WARNING_OPTS += -optc-Waggregate-return
-WARNING_OPTS += -optc-Wpointer-arith
+#WARNING_OPTS += -optc-Wpointer-arith
 WARNING_OPTS += -optc-Wbad-function-cast
 #WARNING_OPTS += -optc-Wcast-align
 #WARNING_OPTS += -optc-Wnested-externs
@@ -53,10 +59,9 @@ 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_CC_OPTS = $(GhcRtsCcOpts)
+SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
 
-ifneq "$(way)" "dll"
+ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
 endif
 # SRC_HC_OPTS += -optc-fPIC
@@ -65,6 +70,27 @@ ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
+# compiling straight C files: use all the HC_OPTS, plus any extra options in
+# $(GhcRtsCcOpts).
+SRC_CC_OPTS += $(GhcRtsCcOpts)
+SRC_CC_OPTS += $(HC_OPTS)
+
+#-----------------------------------------------------------------------------
+# Include the Front panel code?
+
+SRCS_RTS_C :=  $(filter-out Vis%.c, $(SRCS_RTS_C))
+
+# we need GTK+ for the front panel
+ifneq "$(GTK_CONFIG)" ""
+ifeq "$(GhcRtsWithFrontPanel)" "YES"
+SRC_HC_OPTS 		+= `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
+SRCS_RTS_C 		:= $(SRCS_RTS_C) $(wildcard Vis*.c)
+VisCallbacks_CC_OPTS 	+= -optc-Wno-unused
+endif # GhcRtsWithFrontPanel
+endif # GTK_CONFIG
+
+#-----------------------------------------------------------------------------
+
 C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) $(SRCS_RTS_S)
 
 SRC_MKDEPENDC_OPTS += -I. -I../includes
@@ -78,7 +104,17 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 # ../driver/ghc (a better C compiler :-) to compile the
 # different RTS pieces
 #
-CC=$(HC) $(HC_OPTS) $($*_HC_OPTS)
+
+ifeq "$(BootingFromHc)" "YES"
+# use the normal $(CC) when booting from .hc files
+SRC_CC_OPTS := $(patsubst -optc%,%,$(SRC_CC_OPTS))
+SRC_CC_OPTS += $(PLATFORM_CC_OPTS)
+else
+# otherwise, use $(GHC_INPLACE) as the C compiler.
+CC=$(GHC_INPLACE)
+endif
+
+HC=$(GHC_INPLACE)
 
 # prevent this value from leaking into the GMP makefile
 unexport CC
@@ -86,12 +122,15 @@ unexport CC
 # -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.
-# 
-ifeq "$(way)" "dll"
-DLL_NAME          = HSrts.dll
-SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
-
 #
+HSLIB             = rts
+
+ifeq "$(DLLized)" "YES"
+SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
+
+# It's not included in the DLL, but we need to compile it up separately.
+all :: Main.dll_o
+
 # Need an import library containing the symbols the RTS uses from the Prelude.
 # So, to avoid bootstrapping trouble, we build one containing just the syms
 # we need. Weirdly named to avoid clashing later on when compiling the contents
@@ -100,13 +139,10 @@ SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
 # Note: if you do change the name of the Prelude DLL, the "--dllname <nm>.dll"
 # below will need to be updated as well.
 
-$(DLL_NAME) :: libHS_imp_stub.a
+$(DLL_PEN)/HSrts$(_way).dll :: libHS_imp_stub.a
 
 libHS_imp_stub.a :
-	dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSprel.dll
-
-# It's not included in the DLL, but we need to compile it up separately.
-all :: Main.dll_o
+	dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll
 
 endif
 
@@ -118,10 +154,20 @@ endif
 
 ifneq "$(HaveLibGmp)" "YES"
 boot ::
-	cd gmp && ./configure
+	cd gmp && ./configure --enable-shared=no --target=$(HOSTPLATFORM)
+
+# Slight cheatage here to past host as target, but x-compilation isn't supported by ghc.
 
 all :: gmp/libgmp.a
 
+ifeq "$(DLLized)" "YES"
+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 ::
@@ -133,6 +179,7 @@ endif
 
 gmp/libgmp.a ::
 	$(MAKE) -C gmp MAKEFLAGS=
+	@$(CP) gmp/.libs/libgmp.a gmp
 endif
 
 #-----------------------------------------------------------------------------
@@ -141,7 +188,7 @@ endif
 #
 
 ifeq "$(way)" "mp"
-all :: gum/SysMan
+all :: parallel/SysMan
 
 ifdef solaris2_TARGET_OS
 __socket_libs = -lsocket -lnsl
@@ -149,12 +196,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
 
 #-----------------------------------------------------------------------------
@@ -164,6 +211,10 @@ endif
 # Just libHSrts is installed uniformly across ways
 #
 INSTALL_LIBS += $(LIBRARY)
+ifeq "$(DLLized)" "YES"
+INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
+INSTALL_LIBS += $(patsubst %.a,%_imp.a,$(LIBARY))
+INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
+endif
 
 include $(TOP)/mk/target.mk
-