X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=ef3e24403294d0e105a75da8ebb0832dce121b74;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hp=f46cf959ce7081001ff431b6a7a51a482611a1ed;hpb=5e9fd7ed27f970084b4795c5c4619c30a953174f;p=ghc-hetmet.git diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index f46cf95..ef3e244 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 + +WAYS=$(GhcLibWays) $(GhcRTSWays) -PACKAGE = rts +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 @@ -38,7 +48,8 @@ ALL_DIRS = hooks parallel ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" ALL_DIRS += win32 -EXCLUDED_SRCS += Itimer.c Select.c Signals.c +else +ALL_DIRS += posix endif ifneq "$(DLLized)" "YES" @@ -47,19 +58,30 @@ else EXCLUDED_SRCS += Main.c endif +# This file ends up being empty unless we're building for a powerpc +# or darwin system, and it is reported that Solaris ld chokes on it when +# building HSrts.o. +ifeq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" "" +ifeq "$(findstring $(TargetOS_CPP), darwin)" "" +EXCLUDED_SRCS += AdjustorAsm.S +endif +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 @@ -87,11 +109,7 @@ 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 +# 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. @@ -106,24 +124,12 @@ SRC_HC_OPTS += -static endif # SRC_HC_OPTS += -fPIC +RtsMessages_CC_OPTS += -DProjectVersion=\"$(ProjectVersion)\" + 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 @@ -148,6 +154,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? @@ -167,23 +176,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) # ----------------------------------------------------------------------------- # @@ -217,20 +234,18 @@ 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) +ifneq "$(HaveFrameworkGMP)" "YES" boot :: - cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no --target=$(HOSTPLATFORM) -endif + 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" @@ -240,6 +255,7 @@ $(DLL_PEN)/gmp.dll: $(MAKE) -C gmp gmp.dll $(MV) gmp/gmp.dll $(DLL_PEN) endif +endif install :: gmp/libgmp.a @@ -282,6 +298,63 @@ 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 ProfHeap.h \ + -\#include LdvProfile.h \ + -\#include Profiling.h \ + -\#include OSThreads.h \ + -\#include Apply.h \ + -\#include SMP.h + +ifeq "$(Windows)" "YES" +PrimOps_HC_OPTS += -\#include '' -\#include win32/AsyncIO.h +else +PrimOps_HC_OPTS += -\#include posix/Itimer.h +endif + +# -O3 helps unroll some loops (especially in copy() with a constant argument). +# -fno-strict-aliasing is a hack because we often mix StgPtr and StgClosure pointers +# to the same object, and gcc will assume these don't alias. eg. it happens in +# copy() with gcc 3.4.3, the upd_evacee() assigments get moved before the object copy. +GC_HC_OPTS += -optc-O3 -optc-fno-strict-aliasing + +# 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 #