X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=51047146392a20137aea61fa2d2cfd315f361a6a;hb=e375e4a482ec9bb197c013bb015bff810e06ec4b;hp=001c99b8fa3b9ecc7d2612d9b057c07cd9f2dab4;hpb=d3b91076226809b5351e9b0bd1fe0a389f728030;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 001c99b..5104714 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,7 +1,14 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.196 2001/11/03 01:44:04 sof Exp $ +# $Id: Makefile,v 1.217 2002/05/11 10:02:21 panne 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 #----------------------------------------------------------------------------- @@ -18,7 +25,7 @@ WAYS=$(GhcCompilerWays) # equivalent of `env' if it doesn't exist locally). # ifneq "$(way)" "dll" -ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32" HS_PROG=ghc$(_way)-$(ProjectVersion) else HS_PROG=ghc$(_way) @@ -43,6 +50,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) @@ -53,17 +61,18 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk Makefile @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) @@ -81,108 +90,63 @@ endif 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) 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] 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 ($(GhcWithJavaGen),YES) +ALL_DIRS += javaGen +SRC_HC_OPTS += -DJAVA +endif ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES compiling_with_4xx=NO else -bootstrapped = $(shell if (test $(CANON_HC_VERSION) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi) -compiling_with_4xx = $(shell if (test $(CANON_HC_VERSION) -lt 5000); then echo YES; else echo NO; fi) -ghc_502_at_least = $(shell if (test $(CANON_HC_VERSION) -ge 5020); 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) +ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi) endif # Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" ifeq "$(bootstrapped)" "YES" SRC_HC_OPTS += -DGHCI -DIRS += ghci +ALL_DIRS += ghci 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) - # 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) -ge 5010); then echo YES; else echo NO; fi) - -# ----------------------------------------------- -# GHCi calls the C procedure 'rawSystem'; but alas GHC 4.08 -# does not have this. Everything is fine if you are compiling -# GHC with GHC 5.02 or better, but lacking that we have the following -# hack: -# copy rawSystem.c from hslibs/lang/cbits -# into main/ (where it'll be compiled and linked with the compiler) -# (the Haskell-side code is ifdefed into main/SysTools.lhs) - -ifneq "$(ghc_502_at_least)" "YES" -C_SRCS += main/rawSystem.c -SRC_CC_OPTS += -I$(GHC_LIB_DIR)/std/cbits -SRC_MKDEPENDC_OPTS += -I$(GHC_LIB_DIR)/std/cbits -HS_OBJS += main/rawSystem.o -main/rawSystem.c : $(FPTOOLS_TOP)/hslibs/lang/cbits/rawSystem.c - $(CP) $< main -endif -endif -# End of system hack -# ----------------------------------------------- - -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 +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" +ghc_501_at_least = $(shell if (test $(GhcVanonVersion) -ge 5010); then echo YES; else echo NO; fi) endif -# -# 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) +# 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'. @@ -198,16 +162,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:= @@ -216,7 +170,7 @@ space:= $(empty) $(empty) SRC_HC_OPTS += \ -cpp -fglasgow-exts -Rghc-timing \ -I. -IcodeGen -InativeGen -Iparser \ - -i$(subst $(space),:,$(DIRS)) + -i$(subst $(space),:,$(ALL_DIRS)) # Omitted: -I$(GHC_INCLUDE_DIR) # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, @@ -233,16 +187,20 @@ SRC_HC_OPTS += \ # which needs it). SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -ifneq "$(mingw32_TARGET_OS)" "1" -SRC_HC_OPTS += -package concurrent -package posix -package text -package util +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 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O SRC_HC_OPTS += -recomp $(GhcHcOpts) 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 # adds these flags to the command line @@ -255,31 +213,35 @@ 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 "$(compiling_with_4xx)" "YES" -rename/ParseIface_HC_OPTS += -K2m 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 +ifeq "$(bootstrapped)" "YES" +utils/Binary_HC_OPTS = -funbox-strict-fields +endif + # flags for PrimPacked: # -# -monly-3-regs -# because it contains a 'ccall strlen', which gets inlined by -# gcc, causing a lack of registers. +# -monly-2-regs +# because it contains 'ccall strlen' and 'ccall memcmp', which gets +# inlined by gcc, causing a lack of registers. # -utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs +utils/PrimPacked_HC_OPTS = -fvia-C # ByteCodeItbls uses primops that the NCG doesn't support yet. ghci/ByteCodeItbls_HC_OPTS = -fvia-C @@ -303,22 +265,18 @@ 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" +ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" main/SysTools_HC_OPTS += '-\#include ' '-\#include ' endif -# ---------------------------------------------------------------------------- -# C compilations - -SRC_C_OPTS += -O -I. -IcodeGen - +# 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 # from prelude/primops.txt -CLEAN_FILES += prelude/primops.txt - GENPOC=$(TOP)/utils/genprimopcode/genprimopcode PRIMOP_BITS=primop-data-decl.hs-incl \ @@ -333,6 +291,9 @@ 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} @@ -387,7 +348,7 @@ 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) '"$$@"' >>$@ + echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) '-B$(subst \,\\,$(FPTOOLS_TOP_ABS_PLATFORM))' '"$$@"' >>$@ chmod 755 $@ CLEAN_FILES += ghc-inplace @@ -399,22 +360,26 @@ CLEAN_FILES += ghc-inplace # but put it together with the libraries. # Also don't want any interface files installed -ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +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/RnSource_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