X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=a88ea931fe3c1fd12898b37a19f0916345324920;hb=97a8fe8780307e95829034117efa98d2e27109cd;hp=0e7650eca56829507b227117a4a3398277280ab7;hpb=2b7f450a6dbc2f78f99101560f82be20fa80833d;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 0e7650e..a88ea93 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -19,7 +19,8 @@ rts_dist_HC = $(GHC_STAGE1)
 # merge GhcLibWays and GhcRTSWays but strip out duplicates
 rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays))
 
-ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf))
+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
@@ -36,6 +37,7 @@ else
 ALL_DIRS += posix
 endif
 
+EXCLUDED_SRCS += rts/Main.c
 EXCLUDED_SRCS += rts/parallel/SysMan.c
 EXCLUDED_SRCS += rts/dyn-wrapper.c
 EXCLUDED_SRCS += $(wildcard rts/Vis*.c)
@@ -43,6 +45,8 @@ EXCLUDED_SRCS += $(wildcard rts/Vis*.c)
 rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c)))
 rts_CMM_SRCS = $(wildcard rts/*.cmm)
 
+# Don't compile .S files when bootstrapping a new arch
+ifeq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
 ifneq "$(findstring $(TargetArch_CPP), powerpc powerpc64)" ""
 rts_S_SRCS += rts/AdjustorAsm.S
 else
@@ -50,6 +54,7 @@ ifneq "$(findstring $(TargetOS_CPP), darwin)" ""
 rts_S_SRCS += rts/AdjustorAsm.S
 endif
 endif
+endif
 
 ifeq "$(GhcUnregisterised)" "YES"
 GENAPPLY_OPTS = -u
@@ -72,8 +77,8 @@ rts_H_FILES = $(wildcard $(GHC_INCLUDE_DIR)/*.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' > $$@
+	$(GHC_PKG_INPLACE) field rts extra-libraries \
+	  | sed -e 's/^extra-libraries: //' -e 's/\([a-z]*\)/-l\1/g' > $@
 
 #-----------------------------------------------------------------------------
 # Building one way
@@ -85,6 +90,8 @@ define cmm-suffix-rules
 
 # .cmm files depend on all the .h files, to a first approximation.
 
+ifneq "$$(CLEANING)" "YES"
+
 ifneq "$$(BootingFromHc)" "YES"
 
 $1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
@@ -113,6 +120,8 @@ $1/$2/build/%.$$($3_way_)o : $1/%.hc
 $1/$2/build/%.$$($3_way_)o : $1/$2/build/%.hc
 	$$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 
+endif
+
 endef
 
 
@@ -146,11 +155,12 @@ rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS)
 ifneq "$$(findstring dyn, $1)" ""
 $$(rts_$1_LIB) : $$(rts_$1_OBJS) rts/libs.depend
 	$$(RM) $$@
-	$$(rts_dist_HC) -shared -dynamic -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
+	$$(rts_dist_HC) -shared -dynamic -dynload deploy \
+	  -no-auto-link-packages `cat rts/libs.depend` $$(rts_$1_OBJS) -o $$@
 else
 $$(rts_$1_LIB) : $$(rts_$1_OBJS)
 	$$(RM) $$@
-	echo $$(rts_$1_OBJS) | xargs $$(AR) $$(EXTRA_AR_ARGS) $$@
+	echo $$(rts_$1_OBJS) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@
 endif
 
 endef
@@ -246,11 +256,11 @@ endif
 # XXX DQ is now the same on all platforms, so get rid of it
 DQ = \"
 
-# If Main.c is built with optimisation then the SEH exception stuff on
+# If RtsMain.c is built with optimisation then the SEH exception stuff on
 # Windows gets confused.
 # This has to be in HC rather than CC opts, as otherwise there's a
 # -optc-O2 that comes after it.
-Main_HC_OPTS += -optc-O0
+RtsMain_HC_OPTS += -optc-O0
 
 RtsMessages_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
 RtsUtils_CC_OPTS += -DProjectVersion=$(DQ)$(ProjectVersion)$(DQ)
@@ -392,6 +402,12 @@ $(DYNWRAPPER_PROG): $(DYNWRAPPER_SRC)
 	$(HC) -cpp -optc-include -optcdyn-wrapper-patchable-behaviour.h $(INPLACE_EXTRA_FLAGS) $< -o $@
 
 # -----------------------------------------------------------------------------
+# build the static lib containing the C main symbol
+
+rts/dist/build/libHSrtsmain.a : rts/dist/build/Main.o
+	$(AR) $(EXTRA_AR_ARGS) $@ $<
+
+# -----------------------------------------------------------------------------
 # The RTS package config
 
 # If -DDEBUG is in effect, adjust package conf accordingly..