X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=4bb41182844a904db07e8cced3ec699e88f0b972;hb=a2a67cd520b9841114d69a87a423dabcb3b4368e;hp=7db99764a19bfee388ce0ced350c435cfe0d59ab;hpb=fa0cd53b30a261ce282757c12c775e7d6194fd62;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index 7db9976..4bb4118 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -63,7 +63,6 @@ endif rts_AUTO_APPLY_CMM = rts/dist/build/AutoApply.cmm $(rts_AUTO_APPLY_CMM): $(GENAPPLY_INPLACE) - "$(RM)" $(RM_OPTS) $@ "$(GENAPPLY_INPLACE)" >$@ rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c @@ -73,7 +72,7 @@ rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c "$(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) @@ -83,48 +82,6 @@ rts/libs.depend : $(GHC_PKG_INPLACE) #----------------------------------------------------------------------------- # 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. - -ifneq "$$(CLEANING)" "YES" - -ifneq "$$(BootingFromHc)" "YES" - -$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 $$@ - -endif - -$1/$2/build/%.$$($3_way_)o : $1/%.hc - "$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@ - -$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.hc - "$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@ - -endif - -endef - - define build-rts-way # args: $1 = way # The per-way CC_OPTS @@ -173,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 @@ -248,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 @@ -287,14 +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 RetainerSet_CC_OPTS += -Wno-format -sm/Compact_CC_OPTS += -w # On Windows: win32/ConsoleHandler_CC_OPTS += -w win32/ThrIOManager_CC_OPTS += -w @@ -314,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 @@ -364,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 @@ -433,8 +369,8 @@ install : install_rts .PHONY: install_rts install_rts: - "$(MKDIRHIER)" $(DESTDIR)$(libdir) - "$(MKDIRHIER)" $(DESTDIR)$(libdir)/include + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/include "$(CP)" $(ALL_RTS_LIBS) $(DESTDIR)$(libdir) # -----------------------------------------------------------------------------