X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=4edc80bd43f77781b0696ae332a711c740896764;hb=d65574ab3852a0d5b66358f71ae1e34dfcc606c9;hp=750af8e4d9d8633ce03ec70c968c2fb2294fd82c;hpb=7223167c4907ea114bd05935541dbbc8729e46f3;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 750af8e..4edc80b 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.153 2001/04/11 10:24:38 sewardj Exp $ +# $Id: Makefile,v 1.170 2001/07/05 13:31:09 sewardj Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -25,8 +25,10 @@ endif # ----------------------------------------------------------------------------- # Create compiler configuration +# +# The 'echo' commands simply spit the values of various make variables +# into Config.hs, whence they can be compiled and used by GHC itself -CURRENT_DIR = ghc/compiler CONFIG_HS = main/Config.hs boot :: $(CONFIG_HS) @@ -41,30 +43,31 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS) @echo "cTARGETPLATFORM = \"$(TARGETPLATFORM)\"" >> $(CONFIG_HS) - @echo "cCURRENT_DIR = \"$(CURRENT_DIR)\"" >> $(CONFIG_HS) - @echo "cGHC_LIB_DIR = \"$(GHC_LIB_DIR)\"" >> $(CONFIG_HS) - @echo "cGHC_RUNTIME_DIR = \"$(GHC_RUNTIME_DIR)\"" >> $(CONFIG_HS) - @echo "cGHC_UTILS_DIR = \"$(GHC_UTILS_DIR)\"" >> $(CONFIG_HS) - @echo "cGHC_INCLUDE_DIR = \"$(GHC_INCLUDE_DIR)\"" >> $(CONFIG_HS) - @echo "cGHC_DRIVER_DIR = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS) - @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) - @echo "cMkDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS) @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) + @echo "cRAWCPP_FLAGS = \"$(RAWCPP_FLAGS)\"" >> $(CONFIG_HS) + @echo "cGCC = \"$(WhatGccIsCalled)\"" >> $(CONFIG_HS) + @echo "cMKDLL = \"$(BLD_DLL)\"" >> $(CONFIG_HS) + @echo "cGHC_DRIVER_DIR = \"$(GHC_DRIVER_DIR)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY = \"$(GHC_TOUCHY)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY_DIR = \"$(GHC_TOUCHY_DIR)\"" >> $(CONFIG_HS) @echo "cGHC_UNLIT = \"$(GHC_UNLIT)\"" >> $(CONFIG_HS) + @echo "cGHC_UNLIT_DIR = \"$(GHC_UNLIT_DIR)\"" >> $(CONFIG_HS) @echo "cGHC_MANGLER = \"$(GHC_MANGLER)\"" >> $(CONFIG_HS) + @echo "cGHC_MANGLER_DIR = \"$(GHC_MANGLER_DIR)\"" >> $(CONFIG_HS) @echo "cGHC_SPLIT = \"$(GHC_SPLIT)\"" >> $(CONFIG_HS) + @echo "cGHC_SPLIT_DIR = \"$(GHC_SPLIT_DIR)\"" >> $(CONFIG_HS) @echo "cGHC_SYSMAN = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS) + @echo "cGHC_SYSMAN_DIR = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS) + @echo "cGHC_CP = \"$(GHC_CP)\"" >> $(CONFIG_HS) + @echo "cGHC_PERL = \"$(GHC_PERL)\"" >> $(CONFIG_HS) @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) - @echo "cCP = \"$(CP)\"" >> $(CONFIG_HS) - @echo "cRM = \"$(RM)\"" >> $(CONFIG_HS) @echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS) @echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_NAMES = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS) @echo "cUSER_WAY_OPTS = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) - @echo "cRAWCPP = \"$(RAWCPP)\"" >> $(CONFIG_HS) @echo done. CLEAN_FILES += $(CONFIG_HS) @@ -92,21 +95,60 @@ DIRS += ilxGen SRC_HC_OPTS += -DILX endif +# +# Canonicalize the GHC version number - assume it is has the form x.yy.[z] or +# x.yy[.date] where date = yyyymmdd +# +# [First sed substitution gets rid of the '.', second gets rid of the date portion, +# third appends a '0' if the z portion is missing] +# +CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)........$$/\1/g;s/^\(...\)$$/\10/g') + +# 20010625 + ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler -ghc_411_at_least = 1 +ghc_411_at_least = YES else -ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11) +ghc_411_at_least=$(shell if (test $(CANON_HC_VERSION) -ge 4110); then echo YES; else echo NO; fi) endif # Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" -ifeq "$(ghc_411_at_least)" "1" +ifeq "$(ghc_411_at_least)" "YES" SRC_HC_OPTS += -DGHCI DIRS += ghci endif endif +# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in +# for explanatory comment as to what this does. +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -gt 5000); then echo YES; else echo NO; fi) + +# ----------------------------------------------- +# GHCi calls the C procedure 'system', but alas GHC 4.08's +# implementation of this (in the library System) didn't work +# properly on Windows. Everything is fine if you are compiling +# GHC with GHC 5.01 or better, but lacking that we have the following +# hack: +# copy system.c from lib/std (where it is correct) +# into main/system.c (where it'll be compiled and +# linked with the compiler) + +ifneq "$(ghc_501_at_least)" "YES" +C_SRCS += main/system.c +SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits +SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits +HS_OBJS += main/system.o + +main/system.c : ../lib/std/cbits/system.c + $(CP) ../lib/std/cbits/system.c main +endif +endif +# End of system hack +# ----------------------------------------------- + HS_SRCS := $(foreach dir,$(DIRS),$(wildcard $(dir)/*.lhs) $(wildcard $(dir)/*.hs)) HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs $(CONFIG_HS), $(HS_SRCS)) HS_SRCS += $(CONFIG_HS) @@ -121,17 +163,17 @@ ifeq "$(BootingFromHc)" "YES" HCS += rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hc endif -HS_OBJS = \ - $(patsubst %.hc, %.o, $(HCS)) \ - parser/hschooks.o - -DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) - # # Add misc .c helper code (used by the frontend.) # C_SRCS += parser/hschooks.c +HS_OBJS = \ + $(patsubst %.hc, %.o, $(HCS)) \ + $(patsubst %.c, %.o, $(C_SRCS)) + +DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) + # # Big Fudge to get around inherent problem that Makefile setup # has got with 'mkdependC'. @@ -167,11 +209,20 @@ SRC_HC_OPTS += \ -I. -IcodeGen -InativeGen -Iparser \ -i$(subst $(space),:,$(DIRS)) +# Omitted: -I$(GHC_INCLUDE_DIR) +# We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, +# to avoid the use of an explicit path in GHC source files +# (include "../includes/config.h" +# But alas GHC 4.08 (and others for all I know) uses this very +# same include path when compiling the .hc files it generates. +# Disaster! Then the hc file sees the GHC 5.02 (or whatever) +# include files. For the moment we've reverted to using +# an explicit path in the .hs sources + ifneq "$(mingw32_TARGET_OS)" "1" SRC_HC_OPTS += -package concurrent -package posix -package text -package util else SRC_HC_OPTS += -package concurrent -package text -package util -main/TmpFiles_HC_OPTS += -Dmingw32_TARGET_OS endif SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O @@ -196,7 +247,7 @@ main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns # The latest GHC version doesn't have a -K option yet, and it doesn't # seem to be necessary anymore for the modules below. -ifeq "$(ghc_411_at_least)" "0" +ifeq "$(ghc_411_at_least)" "NO" rename/ParseIface_HC_OPTS += -K2m parser/Parser_HC_OPTS += -K2m endif @@ -220,10 +271,27 @@ utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs ghci/ByteCodeItbls_HC_OPTS = -fvia-C ghci/ByteCodeLink_HC_OPTS = -fvia-C -# CSE interacts badly with the top-level IORefs in DriverState, causing some -# of them to be commoned up. We have a fix for this in 5.00+, but earlier -# versions of the compiler will need CSE turned off on this module. +# CSE interacts badly with top-level IORefs (reportedly in DriverState and +# DriverMkDepend), causing some of them to be commoned up. We have a fix for +# this in 5.00+, but earlier versions of the compiler will need CSE turned off. +# To be on the safe side, we disable CSE in *all* modules with top-level IORefs. +compMan/CompManager_HC_OPTS = -fno-cse +ghci/InteractiveUI_HC_OPTS = -fno-cse +main/CmdLineOpts_HC_OPTS = -fno-cse +main/DriverFlags_HC_OPTS = -fno-cse +main/DriverMkDepend_HC_OPTS = -fno-cse +main/DriverPipeline_HC_OPTS = -fno-cse main/DriverState_HC_OPTS = -fno-cse +main/DriverUtil_HC_OPTS = -fno-cse +main/Finder_HC_OPTS = -fno-cse +main/SysTools_HC_OPTS = -fno-cse + +# The #include is vital for the via-C route, else the C +# compiler doesn't realise that the stcall foreign imports are indeed +# stdcall, and doesn't generate the Foo@8 name for them +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +main/SysTools_HC_OPTS += '-\#include ' +endif # ---------------------------------------------------------------------------- # C compilations @@ -302,6 +370,11 @@ ghc-inplace : $(HS_PROG) echo '#!/bin/sh' >>$@ echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@ chmod 755 $@ +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" + @$(RM) $@.bat + echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS) %*" >$@.bat + chmod 755 $@.bat +endif CLEAN_FILES += ghc-inplace