X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=934c4291d6c493b494963c8643912f0acd03c3cf;hb=f97dcf9fc2ea2a419087bca53f2fea811c5181a9;hp=6a75b87bcc9ff1100bc7dcc5d54701b88e9e374d;hpb=85aa72b9dc6803685595936c61f3cab6faab815a;p=ghc-hetmet.git diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index 6a75b87..934c429 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -24,11 +24,21 @@ UseGhcForCc = YES include $(TOP)/mk/boilerplate.mk +PACKAGE = rts + HC=$(GHC_INPLACE) -WAYS=$(GhcLibWays) +# ----------------------------------------------------------------------------- +# RTS ways -PACKAGE = rts +WAYS=$(GhcLibWays) $(GhcRTSWays) + +ifneq "$(findstring debug, $(way))" "" +GhcRtsHcOpts= +GhcRtsCcOpts=-g +endif + +# ----------------------------------------------------------------------------- # Tells the build system not to add various Haskellish options to $(SRC_HC_OPTS) NON_HS_PACKAGE = YES @@ -47,19 +57,28 @@ else EXCLUDED_SRCS += Main.c endif +# This file ends up being empty unless we're building for a powerpc +# system, and it is reported that Solaris ld chokes on it when building +# HSrts.o. +ifeq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" "" +EXCLUDED_SRCS += AdjustorAsm.S +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)) +CMM_SRCS = $(filter-out AutoApply%.cmm, $(wildcard *.cmm)) $(EXTRA_CMM_SRCS) +CMM_OBJS = $(patsubst %.cmm,%.$(way_)o, $(CMM_SRCS)) -CLEAN_FILES += $(HC_OBJS) +CLEAN_FILES += $(CMM_OBJS) # Override the default $(LIBOBJS) (defaults to $(HS_OBJS)) -LIBOBJS = $(C_OBJS) $(HC_OBJS) +LIBOBJS = $(C_OBJS) $(CMM_OBJS) SplitObjs=NO +H_FILES = $(wildcard ../includes/*.h) $(wildcard *.h) + #----------------------------------------------------------------------------- # Flags for compiling RTS .c and .hc files @@ -91,7 +110,7 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" STANDARD_OPTS += -Iwin32 endif -# HC_OPTS is included in both .c and .hc compilations, whereas CC_OPTS is +# HC_OPTS is included in both .c and .cmm 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. @@ -110,21 +129,6 @@ ifeq "$(way)" "mp" SRC_HC_OPTS += -I$$PVM_ROOT/include endif -# You get 'threads support' in the normal -# and profiling ways. -ifeq "$(GhcRtsThreaded)" "YES" -ifeq "$(way)" "" -SRC_CC_OPTS += -DTHREADED_RTS -SRC_HC_OPTS += -optc-DTHREADED_RTS -PACKAGE_CPP_OPTS += -DTHREADED_RTS -endif -ifeq "$(way)" "p" -SRC_CC_OPTS += -DTHREADED_RTS -SRC_HC_OPTS += -optc-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 @@ -149,6 +153,9 @@ SUBDIRS += dotnet LIBOBJS += dotnet/Invoke.o endif +# Suppress uninitialized variable warnings for GC.c +GC_CC_OPTS += -Wno-uninitialized + #----------------------------------------------------------------------------- # Include the Front panel code? @@ -168,23 +175,31 @@ endif #----------------------------------------------------------------------------- # make depend setup -MKDEPENDC_SRCS = $(C_SRCS) $(HC_SRCS) SRC_MKDEPENDC_OPTS += -I. -I../includes +# Hack: we define every way-related option here, so that we get (hopefully) +# a superset of the dependencies. To do this properly, we should generate +# a different set of dependencies for each way. Further hack: PROFILING and +# TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now. +SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG + # ----------------------------------------------------------------------------- # The auto-generated apply code -AUTO_APPLY = AutoApply.hc +# We want a slightly different version for the unregisterised way, so we make +# AutoApply on a per-way basis (eg. AutoApply_p.cmm). + +AUTO_APPLY_CMM = AutoApply$(_way).cmm ifneq "$(BootingFromHc)" "YES" -$(AUTO_APPLY): $(GHC_GENAPPLY) +$(AUTO_APPLY_CMM): $(GHC_GENAPPLY) @$(RM) $@ - $(GHC_GENAPPLY) >$@ + $(GHC_GENAPPLY) $(if $(filter $(way), u debug_u), -u) >$@ endif -EXTRA_SRCS += $(AUTO_APPLY) +EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM) -CLEAN_FILES += $(AUTO_APPLY) +CLEAN_FILES += $(AUTO_APPLY_CMM) # ----------------------------------------------------------------------------- # @@ -218,13 +233,18 @@ endif # and not worth re-implementing in our Makefile framework. ifneq "$(HaveLibGmp)" "YES" -ifneq "$(HaveFrameworkHaskellSupport)" "YES" +ifneq "$(HaveFrameworkGMP)" "YES" boot :: - cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \ - --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'` + if [ -f gmp/config.status ]; then \ + cd gmp && CC=$(WhatGccIsCalled) ./config.status; \ + else \ + cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \ + --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`; \ + fi # Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc. +ifeq "$(way)" "" all :: gmp/libgmp.a ifeq "$(DLLized)" "YES" @@ -234,6 +254,7 @@ $(DLL_PEN)/gmp.dll: $(MAKE) -C gmp gmp.dll $(MV) gmp/gmp.dll $(DLL_PEN) endif +endif install :: gmp/libgmp.a @@ -276,6 +297,54 @@ INSTALL_LIBEXECS += parallel/SysMan endif #----------------------------------------------------------------------------- +# Compiling the cmm files + +# ToDo: should we really include Rts.h here? Required for GNU_ATTRIBUTE(). +SRC_HC_OPTS += \ + -I. \ + -\#include Prelude.h \ + -\#include Rts.h \ + -\#include RtsFlags.h \ + -\#include RtsUtils.h \ + -\#include StgRun.h \ + -\#include Schedule.h \ + -\#include Printer.h \ + -\#include Sanity.h \ + -\#include STM.h \ + -\#include Storage.h \ + -\#include SchedAPI.h \ + -\#include Timer.h \ + -\#include Itimer.h \ + -\#include ProfHeap.h \ + -\#include LdvProfile.h \ + -\#include Profiling.h \ + -\#include Apply.h + +ifeq "$(Windows)" "YES" +PrimOps_HC_OPTS += -\#include '' -\#include win32/AsyncIO.h +endif + +# Cmm must be compiled via-C for now, because the NCG can't handle loops +SRC_HC_OPTS += -fvia-C + +# We *want* type-checking of hand-written cmm. +SRC_HC_OPTS += -dcmm-lint + +ifneq "$(BootingFromHc)" "YES" +# .cmm files depend on all the .h files, to a first approximation. +%.$(way_)o : %.cmm $(H_FILES) + $(HC_PRE_OPTS) + $(HC) $(HC_OPTS) -c $< -o $@ + $(HC_POST_OPTS) + +%.$(way_)hc : %.cmm $(H_FILES) + $(HC) $(HC_OPTS) -C $< -o $@ + +%.$(way_)s : %.cmm $(H_FILES) + $(HC) $(HC_OPTS) -S $< -o $@ +endif + +#----------------------------------------------------------------------------- # # Files to install #