# -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.135 2001/02/11 17:12:35 simonmar Exp $
+# $Id: Makefile,v 1.154 2001/04/13 13:37:24 panne Exp $
TOP = ..
include $(TOP)/mk/boilerplate.mk
HS_PROG=ghc-$(ProjectVersion)
endif
-LINK = ghc
-
# -----------------------------------------------------------------------------
# Create compiler configuration
@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.
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)
+ifeq "$(BootingFromHc)" "YES"
+# HC files are always from a self-booted compiler
+ghc_411_at_least = 1
+else
+ghc_411_at_least = $(shell expr "$(GhcVersion)" \>= 4.11)
+endif
# Only include GHCi if we're bootstrapping with at least version 411
ifeq "$(GhcWithInterpreter)" "YES"
ifeq "$(ghc_411_at_least)" "1"
-SRC_HC_OPTS += -DGHCI -optc-DGHCI
+SRC_HC_OPTS += -DGHCI
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, $(HS_SRCS))
+HS_SRCS := $(filter-out rename/ParseIface.hs parser/Parser.hs main/ParsePkgConf.hs $(CONFIG_HS), $(HS_SRCS))
+HS_SRCS += $(CONFIG_HS)
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-HS_SRCS += rename/ParseIface.hs parser/Parser.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 "$(GhcWithHscBuiltViaC)" "YES"
-HCS += rename/ParseIface.hc parser/Parser.hc
+ifeq "$(BootingFromHc)" "YES"
+HCS += rename/ParseIface.hc parser/Parser.hc main/ParsePkgConf.hc
endif
HS_OBJS = \
# 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_INCLUDES)
# -----------------------------------------------------------------------------
# Haskell compilations
# Compiler to use for building ghc, use the build tree
# driver when booting.
#
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
HC=$(GHC)
-else
-HC=$(GHC_INPLACE)
-endif
#
# 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
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
# not sure if this is required --SDM
main/Main_HC_OPTS = -fvia-C
-prelude/PrimOp_HC_OPTS = -no-recomp
+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
# The latest GHC version doesn't have a -K option yet, and it doesn't
# seem to be necessary anymore for the modules below.
# because it contains a 'ccall strlen', which gets inlined by
# gcc, causing a lack of registers.
#
-# -optC-funfolding-interface-threshold7
-# To stop the definition of 'strLength', which calls strlen, getting
-# into the interface file and spreading the -monly-3-regs virus.
-# We need -optC here because the driver before 3.02 didn't understand
-# the -funfolding flags.
-
-utils/PrimPacked_HC_OPTS = -fvia-C -monly-3-regs -funfolding-interface-threshold7
+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
+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/TmpFiles_HC_OPTS = -fno-cse
# ----------------------------------------------------------------------------
# C compilations
primop-usage.hs-incl \
primop-primop-info.hs-incl
-prelude/PrimOp.o: $(PRIMOP_BITS)
+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 < $< > $@
SRC_LD_OPTS += -no-link-chk
-ifneq "$(GhcWithHscBuiltViaC)" "YES"
-ifeq "$(GhcReportCompiles)" "YES"
-SRC_LD_OPTS += -syslib misc -syslib exts
-endif
-endif
-
# -----------------------------------------------------------------------------
# create ghc-inplace, a convenient way to run ghc from the build tree...
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 $@
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
# Extra tidy, remove the .hc files (if you've got them).
MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \
- parser/Parser.info rename/ParseIface.info \
- parser/Parser.hs rename/ParseIface.hs
+ parser/Parser.info rename/ParseIface.info main/ParsePkgConf.info \
+ parser/Parser.hs rename/ParseIface.hs main/ParsePkgConf.hs
#-----------------------------------------------------------------------------
# Include target-rule boilerplate