X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=fd3b6c4130ab8ffaf19fd858cb772e812ae4fc1d;hb=87bf5c65a7b9dec4a753960a587ccfce9215a6a1;hp=d16513fad37590f99ea7f6b02cffaae5a5ee531b;hpb=1cb6ff5614b60cfb91f8c4c9840f93226a607530;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index d16513f..fd3b6c4 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
@@ -113,6 +140,13 @@ endif # BootingViaC
 	$(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
+# Alex Suffix Rules
+#
+
+%.hs : %.x
+	$(ALEX) $(ALEX_OPTS) $<
+
+#-----------------------------------------------------------------------------
 # hsc2hs Suffix Rules
 #
 ifneq "$(BootingFromHc)" "YES"
@@ -146,6 +180,7 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
+# UseGhcForCc is only relevant when not booting from HC files.
 ifeq "$(UseGhcForCc) $(BootingFromHc)" "YES NO"
 
 $(odir_)%.$(way_)o : %.c
@@ -199,18 +234,6 @@ endif
 	$(FLEX) -t $(FLEX_OPTS) $< > $@
 
 #-----------------------------------------------------------------------------
-# Yacc stuff
-
-%.tab.c %.tab.h : %.y
-	@$(RM) $*.tab.h $*.tab.c y.tab.c y.tab.h y.output
-	$(YACC) $(YACC_OPTS) $<
-	$(MV) y.tab.c $*.tab.c
-	@chmod 444 $*.tab.c
-	$(MV) y.tab.h $*.tab.h
-	@chmod 444 $*.tab.h
-
-
-#-----------------------------------------------------------------------------
 # Runtest rules for calling $(HC) on a single-file Haskell program
 
 %.runtest : %.hs
@@ -305,6 +328,11 @@ endif
 #-----------------------------------------------------------------------------
 # Preprocessor suffix rule
 
+# We're careful to remove cpp-droppings from the generated file; things like
+# '#line' pragmas.  But we also leave in #include directives, because these
+# are likely to be intentional (perhaps the file is going to be CPP'd again -
+# this is used by ghc/compiler/parser/Parser.y.pp).
+
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(RAWCPP_FLAGS) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@
+	$(CPP) $(RAWCPP_FLAGS) $(CPP_OPTS) -x c $< | $(SED) -e '/^#[^i]/d' > $@