FIX #1424: x86_64 NCG generated wrong code for foreign call with >8 double args

[ghc-hetmet.git] / compiler / Makefile

diff --git a/compiler/Makefile b/compiler/Makefile
index 9093d9a..4db30aa 100644 (file)
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -214,6 +214,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile
        @echo "cProjectVersionInt    = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS)
        @echo "cProjectPatchLevel    = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS)
        @echo "cBooterVersion        = \"$(GhcVersion)\"" >> $(CONFIG_HS)
+       @echo "cStage                = STAGE" >> $(CONFIG_HS)
        @echo "cHscIfaceFileVersion  = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS)
        @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS)
        @echo "cGhcUnregisterised    = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS)
@@ -717,6 +718,7 @@ all :: $(odir)/ghc-inplace ghc-inplace
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 all :: $(odir)/ghc-inplace.bat ghc-inplace.bat
+CLEAN_FILES += $(odir)/ghc-inplace.bat ghc-inplace.bat
 endif
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@@ -893,17 +895,48 @@ else
 GhcLibraryName=libHS$(PACKAGE)$(_way).a
 endif
 
+ifneq "$(DOING_BIN_DIST)" "YES"
 $(GHC_PROG) : $(GhcLibraryName) main/Main.hs
        $(RM) package.conf.inplace
        $(RM) $(STAMP_PKG_CONF)
        $(MAKE) $(STAMP_PKG_CONF)
        $(MAKE) -f Makefile.ghcbin $(MFLAGS) HS_PROG=$(GHC_PROG) $@
+endif
 
 # Propagate standard targets to Makefile.ghcbin
 docs runtests $(BOOT_TARGET) TAGS clean distclean mostlyclean maintainer-clean $(INSTALL_TARGET) $(INSTALL_DOCS_TARGET) html chm HxS ps dvi txt::
        $(MAKE) -f Makefile.ghcbin $(MFLAGS) $@
 endif
 
+include $(TOP)/mk/package.mk
+
+#-----------------------------------------------------------------------------
+# binary-dist
+
+ifeq "$(DOING_BIN_DIST)" "YES"
+# This is derived from the sources when we are in a source tree, but we
+# don't have any sources in a bindist, so we have to shortcut it
+HS_IFACES := $(wildcard stage$(stage)/*/*.hi)
+endif
+
+binary-dist:
+       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/compiler
+       $(INSTALL_DIR)                         $(BIN_DIST_DIR)/compiler/stage$(stage)
+       echo "stage=$(stage)"                > $(BIN_DIST_DIR)/compiler/Makefile
+       cat Makefile                        >> $(BIN_DIST_DIR)/compiler/Makefile
+       $(INSTALL_DATA)    package.conf.in     $(BIN_DIST_DIR)/compiler/
+       set -e; for d in stage$(stage)/*/; do $(INSTALL_DIR) $(BIN_DIST_DIR)/compiler/$$d; done
+       set -e; for f in $(HS_IFACES); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+ifneq "$(INSTALL_LIBS)" ""
+       set -e; for f in $(INSTALL_LIBS); do $(INSTALL_DATA) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+endif
+ifneq "$(INSTALL_PROGS)" ""
+       set -e; for f in $(INSTALL_PROGS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+endif
+ifneq "$(INSTALL_LIBEXECS)" ""
+       set -e; for f in $(INSTALL_LIBEXECS); do $(INSTALL_PROGRAM) $$f $(BIN_DIST_DIR)/compiler/$$f; done
+endif
+
 #-----------------------------------------------------------------------------
 #              clean
 
@@ -929,9 +962,10 @@ EXTRA_SRCS += parser/Parser.y
 
 TAGS_HS_SRCS = parser/Parser.y.pp $(filter-out $(DERIVED_SRCS) main/Config.hs parser/Parser.y, $(sort $(SRCS)))
 
-
 include $(TOP)/mk/target.mk
 
+$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
+
 # -----------------------------------------------------------------------------
 # Explicit dependencies