X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=ada683a21ab8d417dd0bb2137b754c87dfb31520;hb=6cf8982ac30be6836a0cdd8be5a6ac1a1a144213;hp=0102bed44cfe0abe45c77a78fecb71b1e3d29ee5;hpb=e53ba3592da5f72d1f701981126dbd28db9df98c;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index 0102bed..ada683a 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -23,9 +23,6 @@ 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 -$(eval $(call distdir-opts,rts,dist)) - # ----------------------------------------------------------------------------- # Defining the sources @@ -63,17 +60,14 @@ 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 - "$(MKDIRHIER)" $(dir $@) +rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c | $$(dir $$@)/. cp $< $@ -rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c - "$(MKDIRHIER)" $(dir $@) +rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(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) @@ -131,27 +125,31 @@ $(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. +# We like plenty of warnings. WARNING_OPTS += -Wall +ifeq "$(GccLT34)" "YES" WARNING_OPTS += -W +else +WARNING_OPTS += -Wextra +endif 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 @@ -173,12 +171,6 @@ ifeq "$(UseLibFFIForAdjustors)" "YES" rts_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS endif -ifeq "$(Windows)" "YES" -# SDM: when compiled with -fasm the RTS currently has bogus references to -# __imp_base_ things, so working around for now: -rts_HC_OPTS += -fvia-C -endif - ifneq "$(DYNAMIC_RTS)" "YES" rts_HC_OPTS += -static else @@ -191,7 +183,7 @@ rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) rts_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) # Otherwise the stack-smash handler gets triggered. -ifeq "$(TargetOS_CPP)" "openbsd" +ifneq "$(findstring $(TargetOS_CPP), darwin openbsd)" "" rts_HC_OPTS += -optc-fno-stack-protector endif @@ -206,6 +198,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 @@ -220,43 +214,46 @@ DQ = \" # Windows gets confused. # This has to be in HC rather than CC opts, as otherwise there's a # -optc-O2 that comes after it. -RtsMain_HC_OPTS += -optc-O0 +rts/RtsMain_HC_OPTS += -optc-O0 -RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) -RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) +rts/RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) +rts/RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ) # -RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ) -RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ) -RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ) -RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DHostPlatform=$(DQ)$(HOSTPLATFORM)$(DQ) +rts/RtsUtils_CC_OPTS += -DHostArch=$(DQ)$(HostArch_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DHostOS=$(DQ)$(HostOS_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DHostVendor=$(DQ)$(HostVendor_CPP)$(DQ) # -RtsUtils_CC_OPTS += -DBuildPlatform=$(DQ)$(BUILDPLATFORM)$(DQ) -RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ) -RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ) -RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DBuildPlatform=$(DQ)$(BUILDPLATFORM)$(DQ) +rts/RtsUtils_CC_OPTS += -DBuildArch=$(DQ)$(BuildArch_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DBuildOS=$(DQ)$(BuildOS_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DBuildVendor=$(DQ)$(BuildVendor_CPP)$(DQ) # -RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ) -RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ) -RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ) -RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DTargetPlatform=$(DQ)$(TARGETPLATFORM)$(DQ) +rts/RtsUtils_CC_OPTS += -DTargetArch=$(DQ)$(TargetArch_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DTargetOS=$(DQ)$(TargetOS_CPP)$(DQ) +rts/RtsUtils_CC_OPTS += -DTargetVendor=$(DQ)$(TargetVendor_CPP)$(DQ) # -RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ) -RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ) +rts/RtsUtils_CC_OPTS += -DGhcUnregisterised=$(DQ)$(GhcUnregisterised)$(DQ) +rts/RtsUtils_CC_OPTS += -DGhcEnableTablesNextToCode=$(DQ)$(GhcEnableTablesNextToCode)$(DQ) # 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 - -StgCRun_CC_OPTS += -w -Typeable_CC_OPTS += -w -RetainerProfile_CC_OPTS += -w -RetainerSet_CC_OPTS += -Wno-format -sm/Compact_CC_OPTS += -w +rts/Interpreter_CC_OPTS += -Wno-strict-prototypes +rts/Adjustor_CC_OPTS += -Wno-strict-prototypes +rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes + +# inlining warnings happen in Compact +rts/sm/Compact_CC_OPTS += -Wno-inline + +# emits warnings about call-clobbered registers on x86_64 +rts/StgCRun_CC_OPTS += -w + +rts/RetainerProfile_CC_OPTS += -w +rts/RetainerSet_CC_OPTS += -Wno-format # On Windows: -win32/ConsoleHandler_CC_OPTS += -w -win32/ThrIOManager_CC_OPTS += -w -win32/Ticker_CC_OPTS += -w +rts/win32/ConsoleHandler_CC_OPTS += -w +rts/win32/ThrIOManager_CC_OPTS += -w +rts/win32/Ticker_CC_OPTS += -w # The above warning supression flags are a temporary kludge. # While working on this module you are encouraged to remove it and fix # any warnings in the module. See @@ -264,16 +261,16 @@ win32/Ticker_CC_OPTS += -w # for details # Without this, thread_obj will not be inlined (at least on x86 with GCC 4.1.0) -sm/Compact_CC_OPTS += -finline-limit=2500 +rts/sm/Compact_CC_OPTS += -finline-limit=2500 # -O3 helps unroll some loops (especially in copy() with a constant argument). -sm/Evac_CC_OPTS += -funroll-loops -sm/Evac_thr_HC_OPTS += -optc-funroll-loops +rts/sm/Evac_CC_OPTS += -funroll-loops +rts/dist/build/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 +rts/dist/build/sm/Evac_thr_HC_OPTS += -optc-DPARALLEL_GC -Irts/sm +rts/dist/build/sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC -Irts/sm #----------------------------------------------------------------------------- # Add PAPI library if needed @@ -310,13 +307,14 @@ endif # 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. rts_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG +rts_MKDEPENDC_OPTS += -Irts/sm rts_WAYS_DASHED = $(subst $(space),,$(patsubst %,-%,$(strip $(rts_WAYS)))) rts_dist_depfile = rts/dist/build/.depend$(rts_WAYS_DASHED) -rts_dist_C_SRCS = $(rts_C_SRCS) +rts_dist_C_SRCS = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) rts_dist_S_SRCS = $(rts_S_SRCS) -rts_dist_C_FILES = $(rts_C_SRCS) $(rts_S_SRCS) +rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS) $(eval $(call build-dependencies,rts,dist)) @@ -369,9 +367,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)$(ghclibdir) + $(INSTALL_DIR) $(DESTDIR)$(ghclibdir)/include + "$(CP)" $(ALL_RTS_LIBS) $(DESTDIR)$(ghclibdir) # ----------------------------------------------------------------------------- # cleaning