Just make C dependencies once, rather than each way
[ghc-hetmet.git] / rts / ghc.mk
index aee28ba..aee3369 100644 (file)
@@ -18,9 +18,10 @@ rts_dist_HC = $(GHC_STAGE1)
 
 # merge GhcLibWays and GhcRTSWays but strip out duplicates
 rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays))
+rts_dist_WAYS = $(rts_WAYS)
 
-ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) \
-              rts/dist/build/libHSrtsmain.a
+ALL_RTS_LIBS = rts/dist/build/libHSrtsmain.a \
+              $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf))
 all_rts : $(ALL_RTS_LIBS)
 
 # -----------------------------------------------------------------------------
@@ -69,14 +70,62 @@ rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/.
 
 rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h)
 
+ifeq "$(HaveDtrace)" "YES"
+DTRACEPROBES_H = rts/dist/build/RtsProbes.h
+rts_H_FILES += $(DTRACEPROBES_H)
+endif
+
 # 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
@@ -95,8 +144,11 @@ 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)
+rts_$1_LIB_NAME = libHSrts$$($1_libsuf)
+rts_$1_LIB = rts/dist/build/$$(rts_$1_LIB_NAME)
 
 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))
@@ -106,15 +158,27 @@ 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 $$@
+ifeq "$(darwin_TARGET_OS)" "1"
+       # Ensure library's install name is correct before anyone links with it.
+       install_name_tool -id $(ghclibdir)/$$(rts_$1_LIB_NAME) $$@
+endif
+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
@@ -171,12 +235,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 +272,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 +319,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_CC_OPTS += -DPARALLEL_GC -Irts/sm
+rts/dist/build/sm/Scav_thr_CC_OPTS += -DPARALLEL_GC -Irts/sm
 
 #-----------------------------------------------------------------------------
 # Add PAPI library if needed
@@ -302,22 +360,29 @@ endif
 # -----------------------------------------------------------------------------
 # dependencies
 
+rts_WAYS_DASHED = $(subst $(space),,$(patsubst %,-%,$(strip $(rts_WAYS))))
+rts_dist_depfile_base = rts/dist/build/.depend$(rts_WAYS_DASHED)
+
+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_thr_EXTRA_C_SRCS) $(rts_S_SRCS)
+
 # Hack: we define every way-related option here, so that we get (hopefully)
 # a superset of the dependencies.  To do this properly, we should generate
-# a different set of dependencies for each way.  Further hack: PROFILING and
+# a different set of dependencies for each way.  Further hack: PROFILING an
+
 # TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now.
-rts_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
+rts_dist_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
 
-rts_WAYS_DASHED = $(subst $(space),,$(patsubst %,-%,$(strip $(rts_WAYS))))
-rts_dist_depfile = rts/dist/build/.depend$(rts_WAYS_DASHED)
+ifeq "$(HaveDtrace)" "YES"
 
-rts_dist_C_SRCS  = $(rts_C_SRCS)
-rts_dist_S_SRCS =  $(rts_S_SRCS)
-rts_dist_C_FILES = $(rts_C_SRCS) $(rts_S_SRCS)
+rts_dist_MKDEPENDC_OPTS += -Irts/dist/build
+
+endif
 
 $(eval $(call build-dependencies,rts,dist))
 
-$(rts_dist_depfile) : libffi/ffi.h
+$(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H)
 
 #-----------------------------------------------------------------------------
 # libffi stuff
@@ -336,10 +401,24 @@ $(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC)
        "$(HC)" -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@
 
 # -----------------------------------------------------------------------------
+# compile dtrace probes if dtrace is supported
+
+ifeq "$(HaveDtrace)" "YES"
+
+rts_CC_OPTS            += -DDTRACE
+rts_HC_OPTS            += -DDTRACE
+
+DTRACEPROBES_SRC = rts/RtsProbes.d
+$(DTRACEPROBES_H): $(DTRACEPROBES_SRC) | $(dir $@)/.
+       "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C -h -o $@ -s $<
+
+endif
+
+# -----------------------------------------------------------------------------
 # 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 +445,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