X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=19163ee8d7ee81e09550a58edddacc1a0757d2a8;hb=2841c2c3238de618025369cac0d79ad2db4dc91e;hp=9dbf2be86933d829196fc0308e0ab4d287bd0778;hpb=7185a7c33692e7b8f01a6557a34d68225501e54b;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 9dbf2be..19163ee 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,4 @@
 #-----------------------------------------------------------------------------
-# $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).
@@ -13,96 +12,174 @@
 #	gmp		-- GNU multi-precision library (for Integer)
 
 #-----------------------------------------------------------------------------
+# Preamble
 
 TOP=..
-DoingRTS=YES
+
+# Set UseGhcForCc: this causes the fptools build system to use a different
+# set of suffix rules for compiling C code, using $(HC) rather than $(CC)
+# and prepending "-optc" to $(CC_OPTS).  NB. must be done before including
+# boilerplate.mk below.
+UseGhcForCc = $(shell if (test "x$(BootingFromHc)" = "xYES"); then echo NO; else echo YES; fi)
+
 include $(TOP)/mk/boilerplate.mk
 
-SplitObjs=NO
+HC=$(GHC_INPLACE)
 
 WAYS=$(GhcLibWays)
 
-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) $(wildcard parallel/*.hc)
+PACKAGE = rts
+
+# Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS)
+NON_HS_PACKAGE = YES
+
+# grab sources from these subdirectories
+ALL_DIRS = hooks parallel
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ALL_DIRS += win32
+EXCLUDED_SRCS += Itimer.c Select.c Signals.c
+endif
 
-ifneq "$(way)" "dll"
-SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
+ifneq "$(DLLized)" "YES"
+EXCLUDED_SRCS += RtsDllMain.c
 else
-SRCS_RTS_C  := $(filter-out Main.c, $(SRCS_RTS_C))
+EXCLUDED_SRCS += Main.c
 endif
 
+EXCLUDED_SRCS += parallel/SysMan.c
+
+# The build system doesn't give us these
+HC_SRCS = $(filter %.hc, $(SRCS))
+HC_OBJS = $(patsubst %.hc,%.$(way_)o, $(HC_SRCS))
+
+CLEAN_FILES += $(HC_OBJS)
+
+# Override the default $(LIBOBJS) (defaults to $(HS_OBJS))
+LIBOBJS = $(C_OBJS) $(HC_OBJS)
+
+SplitObjs=NO
+
 #-----------------------------------------------------------------------------
-# 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.
-WARNING_OPTS += -optc-Wall 
-WARNING_OPTS += -optc-W
-WARNING_OPTS += -optc-Wstrict-prototypes 
-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-Wbad-function-cast
-#WARNING_OPTS += -optc-Wcast-align
-#WARNING_OPTS += -optc-Wnested-externs
-#WARNING_OPTS += -optc-Wshadow
-#WARNING_OPTS += -optc-Wcast-qual
-#WARNING_OPTS += -optc-Wno-unused 
-#WARNING_OPTS += -optc-Wredundant-decls 
-#WARNING_OPTS += -optc-Wconversion
-
-SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
-SRC_CC_OPTS = $(GhcRtsCcOpts)
-
-ifneq "$(way)" "dll"
+WARNING_OPTS += -Wall 
+WARNING_OPTS += -W
+WARNING_OPTS += -Wstrict-prototypes 
+WARNING_OPTS += -Wmissing-prototypes 
+WARNING_OPTS += -Wmissing-declarations
+WARNING_OPTS += -Winline
+WARNING_OPTS += -Waggregate-return
+#WARNING_OPTS += -Wpointer-arith
+WARNING_OPTS += -Wbad-function-cast
+#WARNING_OPTS += -Wcast-align
+#WARNING_OPTS += -Wnested-externs
+#WARNING_OPTS += -Wshadow
+#WARNING_OPTS += -Wcast-qual
+#WARNING_OPTS += -Wno-unused 
+#WARNING_OPTS += -Wredundant-decls 
+#WARNING_OPTS += -Wconversion
+
+STANDARD_OPTS += -I../includes -I. -Iparallel
+# COMPILING_RTS is only used when building Win32 DLL support.
+STANDARD_OPTS += -DCOMPILING_RTS
+
+ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+STANDARD_OPTS += -Iwin32
+endif
+
+# HC_OPTS is included in both .c and .hc compilations, whereas CC_OPTS is
+# only included in .c compilations.  HC_OPTS included the WAY_* opts, which
+# must be included in both types of compilations.
+
+SRC_CC_OPTS += $(WARNING_OPTS)
+SRC_CC_OPTS += $(STANDARD_OPTS)
+
+SRC_CC_OPTS += $(GhcRtsCcOpts)
+SRC_HC_OPTS += $(GhcRtsHcOpts)
+
+ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
 endif
-# SRC_HC_OPTS += -optc-fPIC
+# SRC_HC_OPTS += -fPIC
 
 ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
-C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) $(SRCS_RTS_S)
+ifeq "$(BootingFromHc)" "YES"
+# use the normal $(CC) when booting from .hc files
+SRC_CC_OPTS += $(HC_OPTS)
+endif
 
-SRC_MKDEPENDC_OPTS += -I. -I../includes
+# Currently, you only get 'threads support' in the normal
+# way.
+ifeq "$(GhcRtsThreaded)" "YES"
+ifeq "$(way)" ""
+SRC_CC_OPTS += -DTHREADED_RTS
+PACKAGE_CPP_OPTS += -DTHREADED_RTS
+endif
+endif
+
+# If -DDEBUG is in effect, adjust package conf accordingly..
+ifneq "$(strip $(filter -optc-DDEBUG,$(GhcRtsHcOpts)))" ""
+PACKAGE_CPP_OPTS += -DDEBUG
+endif
+
+ifeq "$(HaveLibMingwEx)" "YES"
+PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
+endif
 
 #-----------------------------------------------------------------------------
-#
-# Compiling the individual files
-#
-# Rules for building various types of objects from C files,
-# override the default suffix rule here, as we want to use
-# ../driver/ghc (a better C compiler :-) to compile the
-# different RTS pieces
-#
-CC=$(GHC_INPLACE) $(HC_OPTS) $($*_HC_OPTS)
-HC=$(GHC_INPLACE)
+# Include the Front panel code?
+
+# we need GTK+ for the front panel
+ifneq "$(GTK_CONFIG)" ""
+ifeq "$(GhcRtsWithFrontPanel)" "YES"
+SRC_HC_OPTS 		+= `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
+VisCallbacks_CC_OPTS 	+= -Wno-unused
+else # GhcRtsWithFrontPanel
+EXCLUDED_SRCS		+= $(wildcard Vis*.c)
+endif
+else # GTK_CONFIG
+EXCLUDED_SRCS		+= $(wildcard Vis*.c)
+endif
 
-# prevent this value from leaking into the GMP makefile
-unexport CC
+#-----------------------------------------------------------------------------
+# make depend setup
+
+MKDEPENDC_SRCS     = $(C_SRCS) $(HC_SRCS)
+SRC_MKDEPENDC_OPTS += -I. -I../includes
+
+# -----------------------------------------------------------------------------
+# The auto-generated apply code
+
+AUTO_APPLY = AutoApply.hc
+
+gen_apply : GenApply.hs
+	$(GHC) -o $@ -I$(GHC_INCLUDE_DIR) GenApply.hs 
+
+$(AUTO_APPLY): $(GHC_GENAPPLY)
+	@$(RM) $@
+	$(GHC_GENAPPLY) >$@
+
+EXTRA_SRCS += $(AUTO_APPLY)
+
+CLEAN_FILES += $(AUTO_APPLY)
 
 # -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.
-# 
-DLL_NAME          = HSrts.dll
-ifeq "$(way)" "dll"
-DLL_IMPLIB_NAME   = libHSrts_imp.a
+#
+ifeq "$(DLLized)" "YES"
+SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
 
-SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \
-                    -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
@@ -111,14 +188,11 @@ SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \
 # 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 HSstd.dll
 
-# It's not included in the DLL, but we need to compile it up separately.
-all :: Main.dll_o
-
 endif
 
 # -----------------------------------------------------------------------------
@@ -128,39 +202,48 @@ endif
 # and not worth re-implementing in our Makefile framework.
 
 ifneq "$(HaveLibGmp)" "YES"
+ifneq "$(HaveFrameworkHaskellSupport)" "YES"
+ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+boot ::
+	cd gmp && ./configure --enable-shared=no \
+		--host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`
+else
+# Pass --target to configure of GMP, so that building for mingwin under
+# cygwin works properly (when the host is not the same as the target)
 boot ::
-	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.
+	cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no --target=$(HOSTPLATFORM)
+endif
 
-# make sure the various configure files are included in a source dist.
-SRC_DIST_FILES += gmp/configure gmp/mpn/configure gmp/mpz/configure
+# Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc.
 
 all :: gmp/libgmp.a
 
-ifeq "$(way)" "dll"
+ifeq "$(DLLized)" "YES"
 all :: $(DLL_PEN)/gmp.dll
 
 $(DLL_PEN)/gmp.dll:
-	make -C gmp gmp.dll
-	mv gmp/gmp.dll $(DLL_PEN)
+	$(MAKE) -C gmp gmp.dll
+	$(MV) gmp/gmp.dll $(DLL_PEN)
 endif
 
 install :: gmp/libgmp.a
 
-clean ::
-	$(MAKE) -C gmp MAKEFLAGS= clean
-
 ifeq "$(way)" ""
+clean distclean maintainer-clean ::
+	-$(MAKE) -C gmp MAKEFLAGS= $@
+
 INSTALL_LIBS += gmp/libgmp.a
 endif
+endif
 
 gmp/libgmp.a ::
 	$(MAKE) -C gmp MAKEFLAGS=
+	@$(CP) gmp/.libs/libgmp.a gmp
+	@$(RANLIB) gmp/libgmp.a
 endif
 
+CLEAN_FILES += gmp/libgmp.a
+
 #-----------------------------------------------------------------------------
 #
 # Building the GUM SysMan
@@ -190,13 +273,10 @@ endif
 # Just libHSrts is installed uniformly across ways
 #
 INSTALL_LIBS += $(LIBRARY)
-ifeq "$(EnableWin32DLLs)" "YES"
+ifeq "$(DLLized)" "YES"
 INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
-ifneq "$(way)" "dll"
-INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBARY))
-endif
+INSTALL_LIBS += $(patsubst %.a,%_imp.a,$(LIBARY))
 INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
 endif
 
 include $(TOP)/mk/target.mk
-