X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=rts%2Fghc.mk;h=a667ac35530e42251c18f9a0ca87aaee2fb1cbc1;hb=2440b61a15e56f0cdee349c2574cdfc40adc6053;hp=aee28ba8e6c09682d5ae8a947bb853586a5c4259;hpb=883d980815437736c486bf69b2f066ef918d2989;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index aee28ba..a667ac3 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -72,7 +72,7 @@ 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' > $@ #----------------------------------------------------------------------------- # Building one way @@ -114,7 +114,7 @@ $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend 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 @@ -171,12 +171,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)) @@ -214,46 +208,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 @@ -261,16 +255,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 @@ -307,13 +301,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)) @@ -339,7 +334,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 @@ -366,9 +361,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