X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=305399a6f124f765ccb71f033953e8cd2f73e40d;hb=73ac2f44193dcfe4cc56aab5b2910cf4edc24a18;hp=44293489d186a38a0cc9df6568c9b8917e8623bf;hpb=6b6f88da9bfde8f26531ba595a0e47be72db5bb0;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 4429348..305399a 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,9 +1,20 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.163 2001/06/25 17:28:30 sof Exp $ +# $Id: Makefile,v 1.224 2002/10/09 15:03:48 simonpj Exp $ TOP = .. + +# Use GHC for compiling C bits (NB. must be before boilerplate include) +# +ifneq "$(BootingFromHc)" "YES" +UseGhcForCc = YES +endif + include $(TOP)/mk/boilerplate.mk +USER_SRCS = $(filter-out $(DERIVED_SRCS),$(SRCS)) +count : + ./count_lines $(USER_SRCS) + #----------------------------------------------------------------------------- # Building ghc different ways (default is just `normal' sequential) WAYS=$(GhcCompilerWays) @@ -14,12 +25,16 @@ WAYS=$(GhcCompilerWays) # Note: there have been reports of people running up against the ARG_MAX limit # when linking ghc with all its constituent object files. The likely source of # the problem is that the environment is a bit too big, so a workaround could -# be to do ` env PATH=$(PATH) make ghc 'to minimise the environment. (or the +# be to do `env PATH=$(PATH) make ghc' to minimise the environment. (or the # equivalent of `env' if it doesn't exist locally). # ifneq "$(way)" "dll" +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" HS_PROG=ghc$(_way)-$(ProjectVersion) else +HS_PROG=ghc$(_way) +endif +else HS_PROG=ghc-$(ProjectVersion) endif @@ -39,6 +54,7 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cProjectName = \"$(ProjectName)\"" >> $(CONFIG_HS) @echo "cProjectVersion = \"$(ProjectVersion)\"" >> $(CONFIG_HS) @echo "cProjectVersionInt = \"$(ProjectVersionInt)\"" >> $(CONFIG_HS) + @echo "cProjectPatchLevel = \"$(ProjectPatchLevel)\"" >> $(CONFIG_HS) @echo "cBooterVersion = \"$(GhcVersion)\"" >> $(CONFIG_HS) @echo "cHscIfaceFileVersion = \"$(HscIfaceFileVersion)\"" >> $(CONFIG_HS) @echo "cHOSTPLATFORM = \"$(HOSTPLATFORM)\"" >> $(CONFIG_HS) @@ -46,22 +62,27 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $(CONFIG_HS) @echo "cGhcUnregisterised = \"$(GhcUnregisterised)\"" >> $(CONFIG_HS) @echo "cLeadingUnderscore = \"$(LeadingUnderscore)\"" >> $(CONFIG_HS) - @echo "cRAWCPP = \"$(GHC_RAWCPP)\"" >> $(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 "cPROJECT_DIR = \"$(PROJECT_DIR)\"" >> $(CONFIG_HS) + @echo "cGHC_DRIVER_DIR_REL = \"$(GHC_DRIVER_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY_PGM = \"$(GHC_TOUCHY_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_TOUCHY_DIR_REL = \"$(GHC_TOUCHY_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_UNLIT_PGM = \"$(GHC_UNLIT_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_UNLIT_DIR_REL = \"$(GHC_UNLIT_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_MANGLER_PGM = \"$(GHC_MANGLER_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_MANGLER_DIR_REL = \"$(GHC_MANGLER_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_SPLIT_PGM = \"$(GHC_SPLIT_PGM)\"" >> $(CONFIG_HS) + @echo "cGHC_SPLIT_DIR_REL = \"$(GHC_SPLIT_DIR_REL)\"" >> $(CONFIG_HS) + @echo "cGHC_SYSMAN_PGM = \"$(GHC_SYSMAN)\"" >> $(CONFIG_HS) + @echo "cGHC_SYSMAN_DIR_REL = \"$(GHC_SYSMAN_DIR)\"" >> $(CONFIG_HS) @echo "cGHC_CP = \"$(GHC_CP)\"" >> $(CONFIG_HS) @echo "cGHC_PERL = \"$(GHC_PERL)\"" >> $(CONFIG_HS) +ifeq ($(GhcWithIlx),YES) + @echo "cILX2IL = \"$(ILX2IL)\"" >> $(CONFIG_HS) + @echo "cILASM = \"$(ILASM)\"" >> $(CONFIG_HS) +endif @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) @echo "cCONTEXT_DIFF = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS) @echo "cHaveLibGmp = \"$(HaveLibGmp)\"" >> $(CONFIG_HS) @@ -73,97 +94,69 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile CLEAN_FILES += $(CONFIG_HS) # ----------------------------------------------------------------------------- -# Set SRCS, HCS, OBJS -# -# First figure out DIRS, the source sub-directories -# Then derive SRCS by looking in them +# Set SRCS etc. # +# First figure out ALL_DIRS, the source sub-directories -DIRS = \ +ALL_DIRS = \ utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \ specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \ - profiling parser usageSP cprAnalysis javaGen compMan + profiling parser usageSP cprAnalysis compMan ndpFlatten + +# Make sure we include Config.hs even if it doesn't exist yet... +ALL_SRCS += $(CONFIG_HS) + +# HsGeneric.hs is not used just now +EXCLUDED_SRCS += hsSyn/HsGeneric.hs ifeq ($(GhcWithNativeCodeGen),YES) -DIRS += nativeGen +ALL_DIRS += nativeGen else SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN endif ifeq ($(GhcWithIlx),YES) -DIRS += ilxGen +ALL_DIRS += ilxGen SRC_HC_OPTS += -DILX endif -# -# Canonicalize the GHC version number - assume it is has the form x.yy.[z]. -# -# [First sed substitution gets rid of the '.' - second appends a '0' if the -# 'z' portion is missing] -# -CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)$$/\10/g') +ifeq ($(GhcWithJavaGen),YES) +ALL_DIRS += javaGen +SRC_HC_OPTS += -DJAVA +endif ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler -ghc_411_at_least = YES +bootstrapped = YES +compiling_with_4xx=NO else -ghc_411_at_least=$(shell if (test $(CANON_HC_VERSION) -ge 4110); then echo YES; else echo NO; fi) +bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi) +compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); 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)" "YES" -SRC_HC_OPTS += -DGHCI -DIRS += ghci +ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" +# Yes, include the interepreter, readline, and Template Haskell extensions +SRC_HC_OPTS += -DGHCI -package haskell-src +ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +SRC_HC_OPTS += -package unix -package readline endif -endif - -# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in -# for explanatory comment as to what this does. -ifeq "$(MinimalUnixDeps)" "YES" -SRC_HC_OPTS += -DMINIMAL_UNIX_DEPS -ghc_501_at_least = $(shell if (test $(CANON_HC_VERSION) -gt 5000); then echo YES; else echo NO; fi) - -ifneq "$(ghc_501_at_least)" "YES" -boot :: - $(CP) ../lib/std/cbits/system.c main -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 -endif -endif - -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) - -ifneq "$(BootingFromHc)" "YES" -HS_SRCS += rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs -endif - -HCS = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS))) - -ifeq "$(BootingFromHc)" "YES" -HCS += rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hc -endif - -HS_OBJS = \ - $(patsubst %.hc, %.o, $(HCS)) \ - parser/hschooks.o +ALL_DIRS += ghci +else +# No interpreter, so exclude Template Haskell modules +EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs +endif -DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) - -# -# Add misc .c helper code (used by the frontend.) -# -C_SRCS += parser/hschooks.c +# There are some C files to include in HS_PROG, so add these to HS_OBJS +HS_OBJS += $(C_OBJS) +# ----------------------------------------------- +# mkdependC stuff # # Big Fudge to get around inherent problem that Makefile setup # has got with 'mkdependC'. # -SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES) +SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR) # ----------------------------------------------------------------------------- # Haskell compilations @@ -174,16 +167,6 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE # HC=$(GHC) -# -# Use GHC for compiling C bits -# -ifeq "$(BootingFromHc)" "YES" -SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -else -CC = $(HC) -CC_OPTS := $(addprefix -optc, $(CC_OPTS)) -endif - # magic from GNU make manual to convert a list of values # into a colon-separated list empty:= @@ -192,26 +175,40 @@ space:= $(empty) $(empty) SRC_HC_OPTS += \ -cpp -fglasgow-exts -Rghc-timing \ -I. -IcodeGen -InativeGen -Iparser \ - -i$(subst $(space),:,$(DIRS)) + $(patsubst %, -i%, $(ALL_DIRS)) -# We should do this, to avoid the use of an explicit path -# in GHC source files (include "../includes/config.h" +# 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 -# -I$(GHC_INCLUDE_DIR) \ - -ifneq "$(mingw32_TARGET_OS)" "1" -SRC_HC_OPTS += -package concurrent -package posix -package text -package util +# +# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR +# when generating dependencies. (=> it gets passed onto mkdependHS, +# which needs it). +SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) + +# When bootstrapped, we don't make use of *any* packages +# (except possibly readline if GHCi is enabled, see above) +ifneq "$(bootstrapped)" "YES" +ifneq "$(mingw32_HOST_OS)" "1" +SRC_HC_OPTS += -package concurrent -package posix -package util else -SRC_HC_OPTS += -package concurrent -package text -package util +SRC_HC_OPTS += -package concurrent -package util +endif endif SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O SRC_HC_OPTS += -recomp $(GhcHcOpts) -SRC_HC_OPTS += -H16m +SRC_HC_OPTS += -H16M + +ifeq "$(BootingFromHc)" "YES" +SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) +endif # Special flags for particular modules # The standard suffix rule for compiling a Haskell file @@ -225,35 +222,31 @@ prelude/PrimOp_HC_OPTS = -no-recomp -H80m # because the NCG can't handle the 64-bit math in here prelude/PrelRules_HC_OPTS = -fvia-C -rename/ParseIface_HC_OPTS += -Onot -H45m -fno-warn-incomplete-patterns -parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns +# Use -fvia-C since the NCG can't handle the narrow16Int# (and intToInt16#?) +# primops on all platforms. +parser/Parser_HC_OPTS += -Onot -fno-warn-incomplete-patterns -fvia-C # 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)" "NO" -rename/ParseIface_HC_OPTS += -K2m +ifeq "$(compiling_with_4xx)" "YES" parser/Parser_HC_OPTS += -K2m endif -ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9" +ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9" rename/RnMonad_HC_OPTS = -O2 -O2-for-C endif utils/StringBuffer_HC_OPTS = -fvia-C -fno-prune-tydecls utils/Digraph_HC_OPTS = -fglasgow-exts -# flags for PrimPacked: -# -# -monly-3-regs -# because it contains a 'ccall strlen', which gets inlined by -# gcc, causing a lack of registers. -# -utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs +ifeq "$(bootstrapped)" "YES" +utils/Binary_HC_OPTS = -funbox-strict-fields +endif # ByteCodeItbls uses primops that the NCG doesn't support yet. ghci/ByteCodeItbls_HC_OPTS = -fvia-C -ghci/ByteCodeLink_HC_OPTS = -fvia-C +ghci/ByteCodeLink_HC_OPTS = -fvia-C -monly-3-regs # 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 @@ -270,11 +263,16 @@ main/DriverUtil_HC_OPTS = -fno-cse main/Finder_HC_OPTS = -fno-cse main/SysTools_HC_OPTS = -fno-cse -# ---------------------------------------------------------------------------- -# C compilations - -SRC_C_OPTS += -O -I. -IcodeGen +# 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 "$(HOSTPLATFORM)" "i386-unknown-mingw32" +main/SysTools_HC_OPTS += '-\#include ' '-\#include ' +endif +# ghc_strlen percolates through so many modules that it is easier to get its +# prototype via a global option instead of a myriad of per-file OPTIONS +SRC_HC_OPTS += '-\#include "hschooks.h"' # ---------------------------------------------------------------------------- # Generate supporting stuff for prelude/PrimOp.lhs @@ -294,6 +292,12 @@ PRIMOP_BITS=primop-data-decl.hs-incl \ primop-usage.hs-incl \ primop-primop-info.hs-incl +CLEAN_FILES += prelude/primops.txt +CLEAN_FILES += $(PRIMOP_BITS) + +SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR) -traditional +SRC_CPP_OPTS += ${GhcCppOpts} + ifneq "$(BootingFromHc)" "YES" prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS) endif @@ -345,13 +349,8 @@ all :: ghc-inplace ghc-inplace : $(HS_PROG) @$(RM) $@ echo '#!/bin/sh' >>$@ - echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS)/ghc/compiler '"$$@"' >>$@ + echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@ chmod 755 $@ -ifeq "$(TARGETPLATFORM) and $(MinimalUnixDeps)" "i386-unknown-mingw32 and YES" - @$(RM) $@.bat - echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS)/ghc/compiler %*" >$@.bat - chmod 755 $@.bat -endif CLEAN_FILES += ghc-inplace @@ -360,20 +359,34 @@ CLEAN_FILES += ghc-inplace # We don't want ghc treated as an ordinary executable, # but put it together with the libraries. -# Also don't want any interface files intstalled +# Also don't want any interface files installed + +DESTDIR = $(INSTALL_LIBRARY_DIR_GHC) +ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32" INSTALL_LIBEXECS += $(HS_PROG) +else +INSTALL_PROGS += $(HS_PROG) +endif + +# ---------------------------------------------------------------------------- +# profiling. + +# rename/Rename_HC_OPTS += -auto-all +# rename/RnEnv_HC_OPTS += -auto-all +# rename/RnHiFiles_HC_OPTS += -auto-all +# rename/RnIfaces_HC_OPTS += -auto-all +# rename/RnSource_HC_OPTS += -auto-all +# rename/RnBinds_HC_OPTS += -auto-all +# rename/RnExpr_HC_OPTS += -auto-all +# rename/RnHsSyn_HC_OPTS += -auto-all +# rename/RnNames_HC_OPTS += -auto-all +# rename/RnTypes_HC_OPTS += -auto-all #----------------------------------------------------------------------------- # clean -CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi) -CLEAN_FILES += $(PRIMOP_BITS) - -# Extra tidy, remove the .hc files (if you've got them). -MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \ - parser/Parser.info rename/ParseIface.info main/ParsePkgConf.info \ - parser/Parser.hs rename/ParseIface.hs main/ParsePkgConf.hs +MAINTAINER_CLEAN_FILES += parser/Parser.info main/ParsePkgConf.info #----------------------------------------------------------------------------- # Include target-rule boilerplate