X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=fb4206c8be2eae600ee67abf3801a4d14a04a00a;hb=1817126134f67120937eafa1f2a5f6b5ed5a02bc;hp=3a746a99729780682d0f78d2f8a31726adbdbb95;hpb=9691b2221175d35e6e49884e5780b1d1695d338e;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index 3a746a9..fb4206c 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -62,11 +62,9 @@ rts_AUTO_APPLY_CMM = rts/dist/build/AutoApply.cmm $(rts_AUTO_APPLY_CMM): $(GENAPPLY_INPLACE) "$(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 includes/*.h) $(wildcard rts/*.h) @@ -74,11 +72,54 @@ 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' > $@ + | sed -e 's/^extra-libraries: //' -e 's/\([a-z0-9]*\)[ ]*/-l\1 /g' > $@ + + +# ---------------------------------------------------------------------------- +# On Windows, as the RTS and base libraries have recursive imports, +# we have to break the loop with "import libraries". +# These are made from rts/win32/libHS*.def which contain lists of +# all the symbols in those libraries used by the RTS. +# +ifneq "$$(findstring dyn, $1)" "" +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" + +ALL_RTS_DEF_LIBNAMES = base ghc-prim +ALL_RTS_DEF_LIBS = \ + rts/dist/build/win32/libHSbase.dll.a \ + rts/dist/build/win32/libHSghc-prim.dll.a \ + rts/dist/build/win32/libHSffi.dll.a + +# -- import libs for the regular Haskell libraries +define make-importlib-def # args $1 = lib name +rts/dist/build/win32/libHS$1.def : rts/win32/libHS$1.def + cat rts/win32/libHS$1.def \ + | sed "s/@LibVersion@/$$(libraries/$1_dist-install_VERSION)/" \ + | sed "s/@ProjectVersion@/$(ProjectVersion)/" \ + > rts/dist/build/win32/libHS$1.def + +rts/dist/build/win32/libHS$1.dll.a : rts/dist/build/win32/libHS$1.def + "$$(DLLTOOL)" -d rts/dist/build/win32/libHS$1.def \ + -l rts/dist/build/win32/libHS$1.dll.a +endef +$(foreach lib,$(ALL_RTS_DEF_LIBNAMES),$(eval $(call make-importlib-def,$(lib)))) + + +# -- import libs for libffi +rts/dist/build/win32/libHSffi.def : rts/win32/libHSffi.def + cat rts/win32/libHSffi.def \ + | sed "s/@ProjectVersion@/$(ProjectVersion)/" \ + > rts/dist/build/win32/libHSffi.def + +rts/dist/build/win32/libHSffi.dll.a : rts/dist/build/win32/libHSffi.def + "$(DLLTOOL)" -d rts/dist/build/win32/libHSffi.def \ + -l rts/dist/build/win32/libHSffi.dll.a +endif +endif + #----------------------------------------------------------------------------- # Building one way - define build-rts-way # args: $1 = way # The per-way CC_OPTS @@ -97,6 +138,8 @@ endif $(call distdir-way-opts,rts,dist,$1) $(call c-suffix-rules,rts,dist,$1,YES) $(call cmm-suffix-rules,rts,dist,$1) +$(call hs-suffix-rules-srcdir,rts,dist,$1,$$(dir)) +# hs-suffix-rules-srcdir is needed when BootingFromHc to get the .hc rules rts_$1_LIB = rts/dist/build/libHSrts$$($1_libsuf) @@ -108,15 +151,23 @@ 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) +# Making a shared library for the RTS. ifneq "$$(findstring dyn, $1)" "" +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend + "$$(RM)" $$(RM_OPTS) $$@ + "$$(rts_dist_HC)" -shared -dynamic -dynload deploy \ + -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) -o $$@ +else $$(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 $$@ +endif else $$(rts_$1_LIB) : $$(rts_$1_OBJS) "$$(RM)" $$(RM_OPTS) $$@ - echo $$(rts_$1_OBJS) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ + echo $$(rts_$1_OBJS) | "$$(XARGS)" $$(XARGS_OPTS) "$$(AR)" $$(AR_OPTS) $$(EXTRA_AR_ARGS) $$@ endif endef @@ -173,12 +224,6 @@ ifeq "$(UseLibFFIForAdjustors)" "YES" rts_CC_OPTS += -DUSE_LIBFFI_FOR_ADJUSTORS endif -ifneq "$(DYNAMIC_RTS)" "YES" -rts_HC_OPTS += -static -else -$(error ToDo: DYNAMIC_RTS) -endif - # Mac OS X: make sure we compile for the right OS version rts_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS) rts_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) @@ -216,46 +261,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 +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 -sm/Compact_CC_OPTS += -Wno-inline +rts/sm/Compact_CC_OPTS += -Wno-inline # emits warnings about call-clobbered registers on x86_64 -StgCRun_CC_OPTS += -w +rts/StgCRun_CC_OPTS += -w -RetainerProfile_CC_OPTS += -w -RetainerSet_CC_OPTS += -Wno-format +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 @@ -263,16 +308,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 -Irts/sm -sm/Scav_thr_HC_OPTS += -optc-DPARALLEL_GC -Irts/sm +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 @@ -309,17 +354,18 @@ 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)) -$(rts_dist_depfile) : libffi/ffi.h +$(rts_dist_depfile) : libffi/dist-install/build/ffi.h #----------------------------------------------------------------------------- # libffi stuff @@ -341,7 +387,7 @@ $(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC) # build the static lib containing the C main symbol rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o - $(AR) $(EXTRA_AR_ARGS) $@ $< + "$(AR)" $(AR_OPTS) $(EXTRA_AR_ARGS) $@ $< # ----------------------------------------------------------------------------- # The RTS package config @@ -368,9 +414,9 @@ install : install_rts .PHONY: install_rts install_rts: - $(INSTALL_DIR) $(DESTDIR)$(ghclibdir) - $(INSTALL_DIR) $(DESTDIR)$(ghclibdir)/include - "$(CP)" $(ALL_RTS_LIBS) $(DESTDIR)$(ghclibdir) + $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)" + $(INSTALL_DIR) "$(DESTDIR)$(ghclibdir)/include" + "$(CP)" $(ALL_RTS_LIBS) "$(DESTDIR)$(ghclibdir)" # ----------------------------------------------------------------------------- # cleaning