X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=4bb41182844a904db07e8cced3ec699e88f0b972;hb=a2a67cd520b9841114d69a87a423dabcb3b4368e;hp=25a264924f83c3667c5f5040c470e16961b0554b;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index 25a2649..4bb4118 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -16,9 +16,11 @@ # We build the RTS with stage 1 rts_dist_HC = $(GHC_STAGE1) -rts_WAYS = $(strip $(GhcLibWays) $(GhcRTSWays)) +# merge GhcLibWays and GhcRTSWays but strip out duplicates +rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays)) -ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)__way).a) +ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) \ + rts/dist/build/libHSrtsmain.a all_rts : $(ALL_RTS_LIBS) # The per-dir options @@ -27,7 +29,7 @@ $(eval $(call distdir-opts,rts,dist)) # ----------------------------------------------------------------------------- # Defining the sources -ALL_DIRS = hooks parallel sm +ALL_DIRS = hooks parallel sm eventlog ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" ALL_DIRS += win32 @@ -35,6 +37,7 @@ else ALL_DIRS += posix endif +EXCLUDED_SRCS += rts/Main.c EXCLUDED_SRCS += rts/parallel/SysMan.c EXCLUDED_SRCS += rts/dyn-wrapper.c EXCLUDED_SRCS += $(wildcard rts/Vis*.c) @@ -42,6 +45,8 @@ EXCLUDED_SRCS += $(wildcard rts/Vis*.c) rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c))) rts_CMM_SRCS = $(wildcard rts/*.cmm) +# Don't compile .S files when bootstrapping a new arch +ifeq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)" ifneq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" "" rts_S_SRCS += rts/AdjustorAsm.S else @@ -49,6 +54,7 @@ ifneq "$(findstring $(TargetOS_CPP), darwin)" "" rts_S_SRCS += rts/AdjustorAsm.S endif endif +endif ifeq "$(GhcUnregisterised)" "YES" GENAPPLY_OPTS = -u @@ -57,49 +63,25 @@ endif rts_AUTO_APPLY_CMM = rts/dist/build/AutoApply.cmm $(rts_AUTO_APPLY_CMM): $(GENAPPLY_INPLACE) - $(RM) $@ - $(GENAPPLY_INPLACE) >$@ + "$(GENAPPLY_INPLACE)" >$@ rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c - $(MKDIRHIER) $(dir $@) + "$(MKDIRHIER)" $(dir $@) cp $< $@ rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c - $(MKDIRHIER) $(dir $@) + "$(MKDIRHIER)" $(dir $@) cp $< $@ -rts_H_FILES = $(wildcard $(GHC_INCLUDE_DIR)/*.h) $(wildcard rts/*.h) +rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h) + +# collect the -l flags that we need to link the rts dyn lib. +rts/libs.depend : $(GHC_PKG_INPLACE) + "$(GHC_PKG_INPLACE)" field rts extra-libraries \ + | sed -e 's/^extra-libraries: //' -e 's/\([a-z]*\)/-l\1/g' > $@ #----------------------------------------------------------------------------- # Building one way -define cmm-suffix-rules -# $1 = dir -# $2 = distdir -# $3 = way - -# .cmm files depend on all the .h files, to a first approximation. - -$1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC) - $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ - -$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC) - $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ - -$1/$2/build/%.$$($3_way_)hc : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC) - $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ - -$1/$2/build/%.$$($3_way_)hc : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC) - $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ - -$1/$2/build/%.$$($3_way_)s : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC) - $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ - -$1/$2/build/%.$$($3_way_)s : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC) - $$($1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@ - -endef - - define build-rts-way # args: $1 = way # The per-way CC_OPTS @@ -107,8 +89,8 @@ ifneq "$$(findstring debug, $1)" "" rts_dist_$1_HC_OPTS = rts_dist_$1_CC_OPTS = -g -O0 else -rts_dist_$1_HC_OPTS = $(GhcRtsHcOpts) -rts_dist_$1_CC_OPTS = $(GhcRtsCcOpts) +rts_dist_$1_HC_OPTS = $$(GhcRtsHcOpts) +rts_dist_$1_CC_OPTS = $$(GhcRtsCcOpts) endif ifneq "$$(findstring thr, $1)" "" @@ -119,17 +101,26 @@ $(call distdir-way-opts,rts,dist,$1) $(call c-suffix-rules,rts,dist,$1,YES) $(call cmm-suffix-rules,rts,dist,$1) -rts_$1_LIB = rts/dist/build/libHSrts$$($1__way).a +rts_$1_LIB = rts/dist/build/libHSrts$$($1_libsuf) rts_$1_C_OBJS = $$(patsubst rts/%.c,rts/dist/build/%.$$($1_osuf),$$(rts_C_SRCS)) $$(patsubst %.c,%.$$($1_osuf),$$(rts_$1_EXTRA_C_SRCS)) rts_$1_S_OBJS = $$(patsubst rts/%.S,rts/dist/build/%.$$($1_osuf),$$(rts_S_SRCS)) -rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_SRCS)) $$(patsubst %.cmm,%.$$($1_osuf),$(rts_AUTO_APPLY_CMM)) +rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_SRCS)) $$(patsubst %.cmm,%.$$($1_osuf),$$(rts_AUTO_APPLY_CMM)) rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS) +rts_dist_$1_CC_OPTS += -DRtsWay=$$(DQ)rts_$1$$(DQ) + +ifneq "$$(findstring dyn, $1)" "" +$$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend + "$$(RM)" $$(RM_OPTS) $$@ + "$$(rts_dist_HC)" -shared -dynamic -dynload deploy \ + -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@ +else $$(rts_$1_LIB) : $$(rts_$1_OBJS) - $$(RM) $$@ - echo $$(rts_$1_OBJS) | xargs $$(AR) $$(EXTRA_AR_ARGS) $$@ + "$$(RM)" $$(RM_OPTS) $$@ + echo $$(rts_$1_OBJS) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ +endif endef @@ -139,27 +130,26 @@ $(foreach way,$(rts_WAYS),$(eval $(call build-rts-way,$(way)))) #----------------------------------------------------------------------------- # Flags for compiling every file -# 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 += -W +# We like plenty of warnings. +WARNING_OPTS += -Wall -Wextra 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 += -Wpointer-arith +WARNING_OPTS += -Wmissing-noreturn +WARNING_OPTS += -Wcast-align +WARNING_OPTS += -Wnested-externs +WARNING_OPTS += -Wredundant-decls + +# These ones are hard to avoid: +#WARNING_OPTS += -Wconversion #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$(GHC_INCLUDE_DIR) -I$(GHC_RTS_DIR) -Irts/parallel -Irts/sm -Irts/eventlog +STANDARD_OPTS += -Iincludes -Irts # COMPILING_RTS is only used when building Win32 DLL support. STANDARD_OPTS += -DCOMPILING_RTS @@ -214,6 +204,8 @@ rts_HC_OPTS += -dcmm-lint # upd_evacee() assigments get moved before the object copy. rts_CC_OPTS += -fno-strict-aliasing +rts_CC_OPTS += -fno-common + ifeq "$(BeConservative)" "YES" rts_CC_OPTS += -DBE_CONSERVATIVE endif @@ -224,15 +216,14 @@ endif # XXX DQ is now the same on all platforms, so get rid of it DQ = \" -# If Main.c is built with optimisation then the SEH exception stuff on +# If RtsMain.c is built with optimisation then the SEH exception stuff on # Windows gets confused. # This has to be in HC rather than CC opts, as otherwise there's a # -optc-O2 that comes after it. -Main_HC_OPTS += -optc-O0 +RtsMain_HC_OPTS += -optc-O0 RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) -RtsUtils_CC_OPTS += -DRtsWay=$(DQ)rts$(_way)$(DQ) # RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ) RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ) @@ -254,13 +245,14 @@ RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode # ffi.h triggers prototype warnings, so disable them here: Interpreter_CC_OPTS += -Wno-strict-prototypes -Adjustor_CC_OPTS += -Wno-strict-prototypes -sm/Storage_CC_OPTS += -Wno-strict-prototypes +Adjustor_CC_OPTS += -Wno-strict-prototypes +sm/Storage_CC_OPTS += -Wno-strict-prototypes + +# inlining warnings happen in Compact +sm/Compact_CC_OPTS += -Wno-inline -StgCRun_CC_OPTS += -w -Typeable_CC_OPTS += -w RetainerProfile_CC_OPTS += -w -sm/Compact_CC_OPTS += -w +RetainerSet_CC_OPTS += -Wno-format # On Windows: win32/ConsoleHandler_CC_OPTS += -w win32/ThrIOManager_CC_OPTS += -w @@ -280,8 +272,8 @@ sm/Evac_thr_HC_OPTS += -optc-funroll-loops # These files are just copies of sm/Evac.c and sm/Scav.c respectively, # but compiled with -DPARALLEL_GC. -sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC -sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC +sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC -Irts/sm +sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC -Irts/sm #----------------------------------------------------------------------------- # Add PAPI library if needed @@ -330,28 +322,6 @@ $(eval $(call build-dependencies,rts,dist)) $(rts_dist_depfile) : libffi/ffi.h -# ----------------------------------------------------------------------------- - -# Need to get the GMP vars in through CPP to package.conf.in, and put -# quotes around each element. - -rts_PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))' -rts_PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))' - -ifneq "$(GMP_INCLUDE_DIRS)" "" -rts_HC_OPTS += -I$(GMP_INCLUDE_DIRS) -rts_CC_OPTS += -I$(GMP_INCLUDE_DIRS) -rts_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS) -endif -ifneq "$(GMP_LIB_DIRS)" "" -rts_LD_OPTS += -L$(GMP_LIB_DIRS) -endif - -rts_CC_OPTS += -Igmp/gmpbuild -rts_HC_OPTS += -Igmp/gmpbuild -rts_HSC2HS_OPTS += -Igmp/gmpbuild -rts_LD_OPTS += -Lgmp/gmpbuild - #----------------------------------------------------------------------------- # libffi stuff @@ -366,7 +336,13 @@ rts_LD_OPTS += -Llibffi/build/include DYNWRAPPER_SRC = rts/dyn-wrapper.c DYNWRAPPER_PROG = rts/dyn-wrapper$(exeext) $(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC) - $(HC) -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@ + "$(HC)" -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@ + +# ----------------------------------------------------------------------------- +# build the static lib containing the C main symbol + +rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o + $(AR) $(EXTRA_AR_ARGS) $@ $< # ----------------------------------------------------------------------------- # The RTS package config @@ -382,7 +358,9 @@ endif $(eval $(call manual-package-config,rts)) +ifneq "$(BootingFromHc)" "YES" rts/package.conf.inplace : $(includes_H_CONFIG) $(includes_H_PLATFORM) +endif # ----------------------------------------------------------------------------- # installing @@ -391,9 +369,9 @@ install : install_rts .PHONY: install_rts install_rts: - $(MKDIRHIER) $(DESTDIR)$(libdir) - $(MKDIRHIER) $(DESTDIR)$(libdir)/include - $(CP) $(ALL_RTS_LIBS) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/include + "$(CP)" $(ALL_RTS_LIBS) $(DESTDIR)$(libdir) # ----------------------------------------------------------------------------- # cleaning