X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=c3d7eb6e6bfaaa538581d7318cf924db069d1107;hb=f4b727487a65e6b611bbaafbd2207bd63a8df706;hp=a4c31d8e80e586ca6cab4ffcafd80e6b1559f878;hpb=e60ef3d0da7e37e7b18088b42925e60b1b47a29e;p=ghc-hetmet.git diff --git a/rts/ghc.mk b/rts/ghc.mk index a4c31d8..c3d7eb6 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -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) # ----------------------------------------------------------------------------- @@ -74,9 +75,52 @@ rts/libs.depend : $(GHC_PKG_INPLACE) "$(GHC_PKG_INPLACE)" field rts extra-libraries \ | 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 @@ -98,7 +142,8 @@ $(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)) @@ -108,23 +153,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. -# On Windows, as the RTS and base library has recursive imports -# we have to break the loop with a import library (libHSbase.so.a) -# This is made from rts/win32/libHSbase.def which contains a list of -# all the symbols in the base library used by the RTS. ifneq "$$(findstring dyn, $1)" "" -$$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +$$(rts_$1_LIB) : $$(rts_$1_OBJS) $$(ALL_RTS_DEF_LIBS) rts/libs.depend "$$(RM)" $$(RM_OPTS) $$@ - ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" - "$$(DLLTOOL)" -d rts/win32/libHSbase.def -l rts/dist/build/win32/libHSbase.so.a "$$(rts_dist_HC)" -shared -dynamic -dynload deploy \ - -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) rts/dist/build/win32/libHSbase.so.a -o $$@ - else + -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 +endif else $$(rts_$1_LIB) : $$(rts_$1_OBJS) "$$(RM)" $$(RM_OPTS) $$@ @@ -277,8 +322,8 @@ 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. -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 +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 @@ -310,15 +355,8 @@ endif # ----------------------------------------------------------------------------- # dependencies -# 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 -# 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_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) @@ -326,7 +364,7 @@ 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/dist-install/build/ffi.h +$(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h #----------------------------------------------------------------------------- # libffi stuff