We also now have GhcThreaded rather than GhcNotThreaded.
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/boilerplate.mk
+ifeq "$(GhcThreaded)$(GhcProfiled)" "YESYES"
+$(error Cannot make GHC both threaded and profiled)
+endif
+
#-----------------------------------------------------------------------------
# Counting source code lines
#-----------------------------------------------------------------------------
# Counting source code lines
count :
./count_lines $(USER_SRCS)
count :
./count_lines $(USER_SRCS)
-#-----------------------------------------------------------------------------
-# Building ghc different ways (default is just `normal' sequential)
-
-WAYS=$(GhcCompilerWays)
-
# -----------------------------------------------------------------------------
# Bootstrapping
# -----------------------------------------------------------------------------
# Bootstrapping
SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE
endif
SRC_HC_OPTS += -DGHCI_TABLES_NEXT_TO_CODE
endif
-ifneq "$(GhcNotThreaded)" "YES"
+ifeq "$(GhcThreaded)" "YES"
# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
# Use threaded RTS with GHCi, so threads don't get blocked at the prompt.
-SRC_HC_OPTS += -threaded
+SRC_LD_OPTS += -threaded
+endif
+ifeq "$(GhcProfiled)" "YES"
+SRC_LD_OPTS += -prof
# right thing for us here.
ifneq "$(findstring $(stage), 2 3)" ""
# right thing for us here.
ifneq "$(findstring $(stage), 2 3)" ""
+BUILD_GHC_PACKAGE=YES
+endif
+
+ifeq "$(BUILD_GHC_PACKAGE)" "YES"
PACKAGE = ghc
HIERARCHICAL_LIB = NO
VERSION = $(ProjectVersion)
PACKAGE = ghc
HIERARCHICAL_LIB = NO
VERSION = $(ProjectVersion)
PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"'
# Omit Main from the library, the client will want to plug their own Main in
PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"'
# Omit Main from the library, the client will want to plug their own Main in
-LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o, $(OBJS))
+LIBOBJS = $(filter-out $(odir)/main/Main.o $(odir)/parser/hschooks.o \
+ $(odir)/main/Main.p_o $(odir)/parser/hschooks.p_o, \
+ $(OBJS))
# disable splitting: it won't really help with GHC, and the specialised
# build system for compiler/ isn't set up to handle it.
# disable splitting: it won't really help with GHC, and the specialised
# build system for compiler/ isn't set up to handle it.
# -package ghc. This is done using a separate Makefile, Makefile.ghcbin
# Why? See comments in Makefile.ghcbin
# -package ghc. This is done using a separate Makefile, Makefile.ghcbin
# Why? See comments in Makefile.ghcbin
# The stage 2 and stage 3 package.conf.in files are different, because they
# point to either the stage2/ or stage3/ dirs in import-dirs. Hence before
# linking the ghc binary we must install the correct version of the package
# The stage 2 and stage 3 package.conf.in files are different, because they
# point to either the stage2/ or stage3/ dirs in import-dirs. Hence before
# linking the ghc binary we must install the correct version of the package
include $(TOP)/mk/target.mk
include $(TOP)/mk/target.mk
+ifeq "$(BUILD_GHC_PACKAGE)" "YES"
+ifeq "$(way)" ""
+all :: $(GHC_PROG)
+endif
+endif
+
$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
#-----------------------------------------------------------------------------
$(odir)/main/Config.$(way_)o: SRC_HC_OPTS+=-DSTAGE='"$(stage)"'
#-----------------------------------------------------------------------------
$(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
endif
$(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS)
$(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
endif
$(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS)
- $(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g; s@^.*/compat.*$$@@g;' <.depend-BASE >.depend-$(stage)
+ $(PERL) -pe 'binmode(stdin); binmode(stdout); s@(\S*[._]o)@stage$(stage)/$$1@g; s@(\S*[._]hi)@stage$(stage)/$$1@g; s@^.*/compat.*$$@@g;' <.depend-BASE >.depend-$(stage)
# The binmode stuff tells perl not to add stupid ^M's to the output
#
# The /lib/compat replacement is to workaround a bug in the
# The binmode stuff tells perl not to add stupid ^M's to the output
#
# The /lib/compat replacement is to workaround a bug in the
-ifneq "$(findstring thr, $(GhcRTSWays))" ""
-ifneq "$(GhcNotThreaded)" "YES"
-SRC_HC_OPTS += -threaded
+ifeq "$(GhcThreaded)" "YES"
+SRC_LD_OPTS += -threaded
+ifeq "$(GhcProfiled)" "YES"
+SRC_LD_OPTS += -prof
GhcStage2HcOpts=
GhcStage3HcOpts=
GhcStage2HcOpts=
GhcStage3HcOpts=
+ifneq "$(findstring thr, $(GhcRTSWays))" ""
+GhcThreaded=YES
+else
+GhcThreaded=NO
+endif
+GhcProfiled=NO
+
# Build a compiler that will build *unregisterised* libraries and
# binaries by default. Unregisterised code is supposed to compile and
# run without any support for architecture-specific assembly mangling,
# Build a compiler that will build *unregisterised* libraries and
# binaries by default. Unregisterised code is supposed to compile and
# run without any support for architecture-specific assembly mangling,