X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FMakefile;h=2c5dcc4f4bf58c1a64c98d50164122b301daa9d9;hp=67201cded58ee9f97784d9b48406c2312a3591dc;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hpb=f638fdfe1d9de1307355c8074fbff9c28342c0ef diff --git a/rts/Makefile b/rts/Makefile index 67201cd..2c5dcc4 100644 --- a/rts/Makefile +++ b/rts/Makefile @@ -7,9 +7,6 @@ # .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) #----------------------------------------------------------------------------- # Preamble @@ -35,7 +32,7 @@ WAYS=$(GhcLibWays) $(GhcRTSWays) ifneq "$(findstring debug, $(way))" "" GhcRtsHcOpts= -GhcRtsCcOpts=-g +GhcRtsCcOpts=-g -O0 endif # ----------------------------------------------------------------------------- @@ -44,7 +41,7 @@ endif NON_HS_PACKAGE = YES # grab sources from these subdirectories -ALL_DIRS = hooks parallel +ALL_DIRS = hooks parallel sm ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" ALL_DIRS += win32 @@ -88,7 +85,7 @@ H_FILES = $(wildcard ../includes/*.h) $(wildcard *.h) # 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 += -Wall +WARNING_OPTS += -Wall WARNING_OPTS += -W WARNING_OPTS += -Wstrict-prototypes WARNING_OPTS += -Wmissing-prototypes @@ -96,7 +93,7 @@ WARNING_OPTS += -Wmissing-declarations WARNING_OPTS += -Winline WARNING_OPTS += -Waggregate-return #WARNING_OPTS += -Wpointer-arith -WARNING_OPTS += -Wbad-function-cast +#WARNING_OPTS += -Wbad-function-cast #WARNING_OPTS += -Wcast-align #WARNING_OPTS += -Wnested-externs #WARNING_OPTS += -Wshadow @@ -105,7 +102,7 @@ WARNING_OPTS += -Wbad-function-cast #WARNING_OPTS += -Wredundant-decls #WARNING_OPTS += -Wconversion -STANDARD_OPTS += -I../includes -I. -Iparallel +STANDARD_OPTS += -I../includes -I. -Iparallel -Ism # COMPILING_RTS is only used when building Win32 DLL support. STANDARD_OPTS += -DCOMPILING_RTS @@ -119,6 +116,11 @@ SRC_CC_OPTS += $(STANDARD_OPTS) SRC_CC_OPTS += $(GhcRtsCcOpts) SRC_HC_OPTS += $(GhcRtsHcOpts) +ifneq "$(GhcWithSMP)" "YES" +SRC_CC_OPTS += -DNOSMP +SRC_HC_OPTS += -optc-DNOSMP +endif + ifneq "$(DLLized)" "YES" SRC_HC_OPTS += -static endif @@ -139,6 +141,10 @@ ifeq "$(HaveLibMingwEx)" "YES" PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX endif +ifeq "$(GhciWithDebugger)" "YES" +STANDARD_OPTS += -DDEBUGGER +endif + ifeq "$(DotnetSupport)" "YES" # @@ -174,6 +180,14 @@ EXCLUDED_SRCS += $(wildcard Vis*.c) endif #----------------------------------------------------------------------------- +# Add PAPI library if needed + +ifeq "$(GhcRtsWithPapi)" "YES" +SRC_HC_OPTS += -optc-DUSE_PAPI +PACKAGE_CPP_OPTS += -DUSE_PAPI +endif + +#----------------------------------------------------------------------------- # make depend setup SRC_MKDEPENDC_OPTS += -I. -I../includes @@ -190,6 +204,8 @@ SRC_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG # We want a slightly different version for the unregisterised way, so we make # AutoApply on a per-way basis (eg. AutoApply_p.cmm). +ifneq "$(DOING_BIN_DIST)" "YES" + AUTO_APPLY_CMM = AutoApply$(_way).cmm ifneq "$(BootingFromHc)" "YES" @@ -202,6 +218,8 @@ EXTRA_CMM_SRCS += $(AUTO_APPLY_CMM) CLEAN_FILES += $(AUTO_APPLY_CMM) +endif + # ----------------------------------------------------------------------------- # # Building DLLs is only supported on mingw32 at the moment. @@ -233,47 +251,30 @@ endif # We use GMP's own configuration stuff, because it's all rather hairy # and not worth re-implementing in our Makefile framework. -ifneq "$(HaveLibGmp)" "YES" -ifneq "$(HaveFrameworkGMP)" "YES" -boot :: - 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" -all :: $(DLL_PEN)/gmp.dll - -$(DLL_PEN)/gmp.dll: - $(MAKE) -C gmp gmp.dll - $(MV) gmp/gmp.dll $(DLL_PEN) -endif -endif +CLEAN_FILES += gmp/libgmp.a -install :: gmp/libgmp.a +# Need to get the GMP vars in through CPP to package.conf.in, and put +# quotes around each element. -ifeq "$(way)" "" -clean distclean maintainer-clean :: - -$(MAKE) -C gmp MAKEFLAGS= $@ +empty = +space = $(empty) $(empty) +comma = , +PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))' +PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))' -INSTALL_LIBS += gmp/libgmp.a +ifneq "$(GMP_INCLUDE_DIRS)" "" +SRC_HC_OPTS += -I$(GMP_INCLUDE_DIRS) +SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS) +SRC_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS) endif +ifneq "$(GMP_LIB_DIRS)" "" +SRC_LD_OPTS += -L$(GMP_LIB_DIRS) endif -gmp/libgmp.a :: - $(MAKE) -C gmp MAKEFLAGS= - @$(CP) gmp/.libs/libgmp.a gmp - @$(RANLIB) gmp/libgmp.a -endif - -CLEAN_FILES += gmp/libgmp.a +SRC_CC_OPTS += -I../gmp/gmpbuild +SRC_HC_OPTS += -I../gmp/gmpbuild +SRC_HSC2HS_OPTS += -I../gmp/gmpbuild +SRC_LD_OPTS += -L../gmp/gmpbuild #----------------------------------------------------------------------------- # @@ -301,26 +302,7 @@ 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 +SRC_HC_OPTS += -I. -\#include HCIncludes.h ifeq "$(Windows)" "YES" PrimOps_HC_OPTS += -\#include '' -\#include win32/AsyncIO.h @@ -334,10 +316,18 @@ SRC_HC_OPTS += -optc-fno-stack-protector 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 +sm/Evac_HC_OPTS += -optc-funroll-loops + +# Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0) +sm/Compact_HC_OPTS += -optc-finline-limit=2500 + +# -fno-strict-aliasing is required for the runtime, because we often +# use a variety of types to represent closure pointers (StgPtr, +# StgClosure, StgMVar, etc.), and without -fno-strict-aliasing gcc is +# allowed to assume that these pointers do not alias. eg. without +# this flag we get problems in GC.c:copy() with gcc 3.4.3, the +# upd_evacee() assigments get moved before the object copy. +SRC_CC_OPTS += -fno-strict-aliasing # Cmm must be compiled via-C for now, because the NCG can't handle loops SRC_HC_OPTS += -fvia-C @@ -365,11 +355,25 @@ 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_PROGS += gmp/gmp.dll INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o endif +#----------------------------------------------------------------------------- +# +# binary-dist + include $(TOP)/mk/target.mk + +binary-dist: + $(INSTALL_DIR) $(BIN_DIST_DIR)/rts + $(INSTALL_DIR) $(BIN_DIST_DIR)/rts/gmp + $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/rts/ + $(INSTALL_DATA) package.conf.in $(BIN_DIST_DIR)/rts/ +ifneq "$(INSTALL_LIBS)" "" + $(INSTALL_DATA) $(INSTALL_LIBS) $(BIN_DIST_DIR)/rts/ +endif +ifneq "$(INSTALL_LIBEXECS)" "" + $(INSTALL_PROGRAM) $(INSTALL_LIBEXECS) $(BIN_DIST_DIR)/rts/ +endif