X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=a8e1a834471cdfc4ba41ceb99fb0e5de6ba5d599;hb=225d251337438e2f7870f0ec2781b1c616ef7462;hp=c7b1fc2d0588fdd742535771be6533962da48910;hpb=aea0a3d6bd57fe3c4710bee87a3c778d5bfd6da1;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index c7b1fc2..a8e1a83 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.164 2001/06/25 21:08:01 sof Exp $ +# $Id: Makefile,v 1.180 2001/08/02 05:15:33 qrczak Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -46,7 +46,7 @@ $(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) @@ -108,14 +108,16 @@ CANON_HC_VERSION=$(shell echo "$(GhcVersion)" | sed -e 's/\.//g;s/^\(...\)...... 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 $(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)" "YES" +ifeq "$(bootstrapped)" "YES" SRC_HC_OPTS += -DGHCI DIRS += ghci endif @@ -123,19 +125,31 @@ 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 +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" -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 + +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)) @@ -151,22 +165,22 @@ 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'. # -SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDES) +SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) -I$(GHC_INCLUDE_DIR) # ----------------------------------------------------------------------------- # Haskell compilations @@ -197,14 +211,15 @@ SRC_HC_OPTS += \ -I. -IcodeGen -InativeGen -Iparser \ -i$(subst $(space),:,$(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 @@ -214,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 @@ -234,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)" "NO" +ifeq "$(compiling_with_4xx)" "YES" rename/ParseIface_HC_OPTS += -K2m parser/Parser_HC_OPTS += -K2m endif @@ -273,6 +292,13 @@ 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 @@ -283,6 +309,11 @@ SRC_C_OPTS += -O -I. -IcodeGen # Generate supporting stuff for prelude/PrimOp.lhs # from prelude/primops.txt +# Run prelude/primops.txt through the preprocessor, to weed out +# primitives that don't (need to) exist on 64-bit architectures. +prelude/primops.i: prelude/primops.txt + $(CPP) -I$(GHC_INCLUDE_DIR) -x c $< 2>/dev/null | $(SED) -e '/^#/d' > $@ + GENPOC=$(TOP)/utils/genprimopcode/genprimopcode PRIMOP_BITS=primop-data-decl.hs-incl \ @@ -305,27 +336,27 @@ ifneq "$(BootingFromHc)" "YES" depend :: $(PRIMOP_BITS) endif -primop-data-decl.hs-incl: prelude/primops.txt +primop-data-decl.hs-incl: prelude/primops.i $(GENPOC) --data-decl < $< > $@ -primop-tag.hs-incl: prelude/primops.txt +primop-tag.hs-incl: prelude/primops.i $(GENPOC) --primop-tag < $< > $@ -primop-list.hs-incl: prelude/primops.txt +primop-list.hs-incl: prelude/primops.i $(GENPOC) --primop-list < $< > $@ -primop-has-side-effects.hs-incl: prelude/primops.txt +primop-has-side-effects.hs-incl: prelude/primops.i $(GENPOC) --has-side-effects < $< > $@ -primop-out-of-line.hs-incl: prelude/primops.txt +primop-out-of-line.hs-incl: prelude/primops.i $(GENPOC) --out-of-line < $< > $@ -primop-commutable.hs-incl: prelude/primops.txt +primop-commutable.hs-incl: prelude/primops.i $(GENPOC) --commutable < $< > $@ -primop-needs-wrapper.hs-incl: prelude/primops.txt +primop-needs-wrapper.hs-incl: prelude/primops.i $(GENPOC) --needs-wrapper < $< > $@ -primop-can-fail.hs-incl: prelude/primops.txt +primop-can-fail.hs-incl: prelude/primops.i $(GENPOC) --can-fail < $< > $@ -primop-strictness.hs-incl: prelude/primops.txt +primop-strictness.hs-incl: prelude/primops.i $(GENPOC) --strictness < $< > $@ -primop-usage.hs-incl: prelude/primops.txt +primop-usage.hs-incl: prelude/primops.i $(GENPOC) --usage < $< > $@ -primop-primop-info.hs-incl: prelude/primops.txt +primop-primop-info.hs-incl: prelude/primops.i $(GENPOC) --primop-primop-info < $< > $@ @@ -348,11 +379,11 @@ 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_UNIX)/ghc/compiler/$(HS_PROG) -B$(FPTOOLS_TOP_ABS) '"$$@"' >>$@ chmod 755 $@ -ifeq "$(TARGETPLATFORM) and $(MinimalUnixDeps)" "i386-unknown-mingw32 and YES" +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" @$(RM) $@.bat - echo "@"$(subst /,\\,$(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG)) "-B$(FPTOOLS_TOP_ABS)/ghc/compiler %*" >$@.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