X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=b3bc8fcd53eac86669dc68040b1cc6257125f162;hb=8e57a9c2bc401b55ed154c587d0bedae58be001b;hp=02469fe96c258202c7cba4fae1a83a2781c3615f;hpb=0bffad417b3f17666c046be53d14e67c1949a64f;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 02469fe..b3bc8fc 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -25,11 +25,6 @@
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
-# Turn off all the Haskell suffix rules if we're booting from .hc
-# files.  The file bootstrap.mk contains alternative suffix rules in
-# this case.
-ifneq "$(BootingFromHc)" "YES"
-
 # The $(odir) support is for building GHC, where we need to build three
 # different versions from the same sources.  See ghc/compiler/Makefile.
 ifneq "$(odir)" ""
@@ -38,6 +33,11 @@ else
 odir_ =
 endif
 
+# Turn off all the Haskell suffix rules if we're booting from .hc
+# files.  The file bootstrap.mk contains alternative suffix rules in
+# this case.
+ifneq "$(BootingFromHc)" "YES"
+
 $(odir_)%.$(way_)o : %.hs
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi
@@ -56,12 +56,12 @@ $(odir_)%.$(way_)hc : %.hs
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
 
-$(odir_)%.$(way_)o : %.$(way_)hc 
+$(odir_)%.$(way_)o : %.$(way_)hc
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
-$(odir_)%.$(way_)o : %.hc 
+$(odir_)%.$(way_)o : %.hc
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
@@ -99,7 +99,34 @@ $(odir_)%.$(way_)hi : %.$(way_)hc
 	else exit 0 ; \
 	fi
 
-endif # BootingViaC
+else # BootingFromHc
+
+# -----------------------------------------------------------------------------
+# suffix rules for building a .o from a .hc file in bootstrap mode.
+
+ifeq "$(BootingFromUnregisterisedHc)" "YES"
+
+# without mangling
+
+$(odir_)%.o : %.hc
+	$(CC) -x c $< -o $@ -c -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
+
+else
+
+# with mangling
+
+$(odir_)%.raw_s : %.hc
+	$(CC) -x c $< -o $@ -S -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
+
+$(odir_)%.s : %.raw_s
+	$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
+
+$(odir_)%.o : %.s
+	$(CC) -c -o $@ $<
+
+endif # not BootingFromUnregisterisedHc
+
+endif # BootingFromHc
 
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
@@ -135,7 +162,7 @@ endif
 .PRECIOUS: %.gc
 
 %.hs %_stub_ffi.c %_stub_ffi.h : %.gc
-	$(GREENCARD) $(GC_OPTS) $< -o $@
+	$(GREENCARD) $(GC_OPTS) $<
 
 %.lhs : %.gc
 	$(GREENCARD) $(GC_OPTS) $< -o $@
@@ -146,13 +173,14 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
-ifeq "$(UseGhcForCc)" "YES"
+# UseGhcForCc is only relevant when not booting from HC files.
+ifeq "$(UseGhcForCc) $(BootingFromHc)" "YES NO"
 
-$(odir_)%.$(way_)o : %.$(way_)s
+$(odir_)%.$(way_)o : %.c
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-$(odir_)%.$(way_)o : %.c
+$(odir_)%.$(way_)o : %.$(way_)s
 	@$(RM) $@
 	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
@@ -166,14 +194,14 @@ $(odir_)%.$(way_)s : %.c
 
 else
 
-$(odir_)%.$(way_)o : %.$(way_)s
-	@$(RM) $@
-	$(AS) $(AS_OPTS) -o $@ $<
-
 $(odir_)%.$(way_)o : %.c
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
 
+$(odir_)%.$(way_)o : %.$(way_)s
+	@$(RM) $@
+	$(AS) $(AS_OPTS) -o $@ $<
+
 $(odir_)%.$(way_)o : %.S
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
@@ -307,4 +335,4 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@
+	$(CPP) $(RAWCPP_FLAGS) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@