X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=054a97a30992b84e70cee5f11ca98f32af2feae7;hb=ea138284b7343bb1810cfbd0284a608dc57f7d46;hp=3ebdf2a6f96a9750453a1ccd6fe0971b578dea29;hpb=8c0fb915ad2992887562db8163ed53dfd201f2ef;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 3ebdf2a..054a97a 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.145 2001/03/24 14:58:04 simonmar Exp $ +# $Id: Makefile,v 1.181 2001/08/04 06:19:54 ken Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -23,12 +23,12 @@ else HS_PROG=ghc-$(ProjectVersion) endif -LINK = ghc - # ----------------------------------------------------------------------------- # 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) @@ -43,35 +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 "clibdir = \"$(libdir)\"" >> $(CONFIG_HS) - @echo "clibexecdir = \"$(libexecdir)\"" >> $(CONFIG_HS) - @echo "cdatadir = \"$(datadir)\"" >> $(CONFIG_HS) - @echo "cbindir = \"$(bindir)\"" >> $(CONFIG_HS) @echo "cDEFAULT_TMPDIR = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS) - @echo "cFPTOOLS_TOP_ABS = \"$(FPTOOLS_TOP_ABS)\"" >> $(CONFIG_HS) - @echo "cRAWCPP = \"$(RAWCPP)\"" >> $(CONFIG_HS) @echo done. CLEAN_FILES += $(CONFIG_HS) @@ -92,22 +88,69 @@ ifeq ($(GhcWithNativeCodeGen),YES) DIRS += nativeGen else SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN +endif + ifeq ($(GhcWithIlx),YES) DIRS += ilxGen SRC_HC_OPTS += -DILX endif -endif -ghc_411_at_least = $(shell expr "$(GhcMinVersion)" \>= 11) +# +# 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 +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) +endif # Only include GHCi if we're bootstrapping with at least version 411 ifeq "$(GhcWithInterpreter)" "YES" -ifeq "$(ghc_411_at_least)" "1" +ifeq "$(bootstrapped)" "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) @@ -119,25 +162,25 @@ endif HCS = $(patsubst %.lhs, %.hc, $(patsubst %.hs, %.hc, $(HS_SRCS))) ifeq "$(BootingFromHc)" "YES" -HCS += rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hs +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'. # -SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) +SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR) # ----------------------------------------------------------------------------- # Haskell compilations @@ -151,8 +194,12 @@ 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 @@ -164,6 +211,16 @@ 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 @@ -172,7 +229,11 @@ endif SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O SRC_HC_OPTS += -recomp $(GhcHcOpts) -SRC_HC_OPTS += -H16m +# TODO: change back to 16M when the strictness analyser is working again. +SRC_HC_OPTS += -H80M +# TODO: remove when the strictness analyser is working again. +rename/ParseIface_HC_OPTS += -H120M +parser/Parser_HC_OPTS += -H100M # Special flags for particular modules # The standard suffix rule for compiling a Haskell file @@ -192,7 +253,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 "$(compiling_with_4xx)" "YES" rename/ParseIface_HC_OPTS += -K2m parser/Parser_HC_OPTS += -K2m endif @@ -214,11 +275,29 @@ utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs # ByteCodeItbls uses primops that the NCG doesn't support yet. ghci/ByteCodeItbls_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. +ghci/ByteCodeLink_HC_OPTS = -fvia-C + +# 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 @@ -230,6 +309,8 @@ SRC_C_OPTS += -O -I. -IcodeGen # 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 \ @@ -244,9 +325,13 @@ PRIMOP_BITS=primop-data-decl.hs-incl \ primop-usage.hs-incl \ primop-primop-info.hs-incl +ifneq "$(BootingFromHc)" "YES" prelude/PrimOp.lhs prelude/PrimOp.o: $(PRIMOP_BITS) +endif +ifneq "$(BootingFromHc)" "YES" depend :: $(PRIMOP_BITS) +endif primop-data-decl.hs-incl: prelude/primops.txt $(GENPOC) --data-decl < $< > $@ @@ -288,11 +373,16 @@ SRC_LD_OPTS += -no-link-chk all :: ghc-inplace -ghc-inplace : ghc +ghc-inplace : $(HS_PROG) @$(RM) $@ echo '#!/bin/sh' >>$@ - echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/ghc -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@ + 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) %1 %2 %3 %4 %5 %6 %7 %8 %9" >$@.bat + chmod 755 $@.bat +endif CLEAN_FILES += ghc-inplace @@ -303,7 +393,7 @@ CLEAN_FILES += ghc-inplace # but put it together with the libraries. # Also don't want any interface files intstalled -INSTALL_PROGS += $(HS_PROG) +INSTALL_LIBEXECS += $(HS_PROG) #----------------------------------------------------------------------------- # clean