X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=4f8c669f2dac7ade4b5fa185c55c21f33e208b19;hb=0cee2f73fde926a0ce90956f3d02666e81669ede;hp=6565340f9184e3bec38b81a858b963b9455a6e54;hpb=a4b8fbfcd755b1c266d2d17103f1dca8fc36bc81;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 6565340..4f8c669 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,4 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.47 2001/04/24 15:03:37 simonmar Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -13,28 +12,48 @@
 #	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
 
 ifneq "$(DLLized)" "YES"
-SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
+EXCLUDED_SRCS += RtsDllMain.c
 else
-SRCS_RTS_C  := $(filter-out Main.c, $(SRCS_RTS_C))
+EXCLUDED_SRCS += Main.c
 endif
 
-LIBOBJS = $(patsubst %.c,%.$(way_)o,$(SRCS_RTS_C)) \
-          $(patsubst %.hc,%.$(way_)o,$(SRCS_RTS_HC)) \
-          $(patsubst %.S,%.$(way_)o,$(SRCS_RTS_S))
+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
 
 #-----------------------------------------------------------------------------
 # Flags for compiling RTS .c and .hc files
@@ -59,9 +78,19 @@ WARNING_OPTS += -Wbad-function-cast
 #WARNING_OPTS += -Wredundant-decls 
 #WARNING_OPTS += -Wconversion
 
-SRC_CC_OPTS +=  $(GhcRtsCcOpts)  $(WARNING_OPTS) -DCOMPILING_RTS
+STANDARD_OPTS += -I../includes -I. -Iparallel
+# COMPILING_RTS is only used when building Win32 DLL support.
+STANDARD_OPTS += -DCOMPILING_RTS
+
+# 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_HC_OPTS += -I../includes -I. -Iparallel $(GhcRtsHcOpts) -DCOMPILING_RTS
+SRC_CC_OPTS += $(GhcRtsCcOpts)
+SRC_HC_OPTS += $(GhcRtsHcOpts)
 
 ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
@@ -72,56 +101,54 @@ ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
+ifeq "$(BootingFromHc)" "YES"
+# use the normal $(CC) when booting from .hc files
+SRC_CC_OPTS += $(HC_OPTS)
+endif
+
+# 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
+
 #-----------------------------------------------------------------------------
 # 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` -DRTS_GTK_FRONTPANEL
-SRCS_RTS_C 		:= $(SRCS_RTS_C) $(wildcard Vis*.c)
+SRC_HC_OPTS 		+= `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
 VisCallbacks_CC_OPTS 	+= -Wno-unused
-endif # GhcRtsWithFrontPanel
-endif # GTK_CONFIG
+else # GhcRtsWithFrontPanel
+EXCLUDED_SRCS		+= $(wildcard Vis*.c)
+endif
+else # GTK_CONFIG
+EXCLUDED_SRCS		+= $(wildcard Vis*.c)
+endif
 
 #-----------------------------------------------------------------------------
+# make depend setup
 
-C_SRCS = $(SRCS_RTS_C) $(SRCS_RTS_HC) $(SRCS_RTS_S)
-
+MKDEPENDC_SRCS     = $(C_SRCS) $(HC_SRCS)
 SRC_MKDEPENDC_OPTS += -I. -I../includes
 
-#-----------------------------------------------------------------------------
-#
-# 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
-#
-
-ifeq "$(BootingFromHc)" "YES"
-# use the normal $(CC) when booting from .hc files
-SRC_CC_OPTS += $(HC_OPTS)
-else
-# otherwise, use $(GHC_INPLACE) as the C compiler.
-CC=$(GHC_INPLACE)
-CC_OPTS := $(addprefix -optc, $(CC_OPTS)) $(HC_OPTS)
-endif
-
-HC=$(GHC_INPLACE)
-
-# prevent this value from leaking into the GMP makefile
-unexport CC
-
 # -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 #
-HSLIB             = rts
-
 ifeq "$(DLLized)" "YES"
 SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
 
@@ -150,15 +177,19 @@ 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
+	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 ::
-	cd gmp && ./configure --enable-shared=no --target=$(HOSTPLATFORM)
+	cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no --target=$(HOSTPLATFORM)
 endif
 
-# Slight cheatage here to past host as target, but x-compilation isn't supported by ghc.
+# Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc.
 
 all :: gmp/libgmp.a
 
@@ -172,18 +203,22 @@ endif
 
 install :: gmp/libgmp.a
 
+ifeq "$(way)" ""
 clean distclean maintainer-clean ::
-	$(MAKE) -C gmp MAKEFLAGS= $@
+	-$(MAKE) -C gmp MAKEFLAGS= $@
 
-ifeq "$(way)" ""
 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