Delete GhcLibProfiled

Simon M and I looked at this, and we think GhcLibProfiled is
(a) not needed (b) confusing.

Ian should review.

Really, if GhcProfiled is on we should also
check that 'p' is in the GhcLibWays

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 54b3012..5387c8b 100644 (file)
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -351,12 +351,7 @@ else
 compiler_CONFIGURE_OPTS += --ghc-option=-DNO_REGS
 endif
 
-# We need to turn on profiling either if we have been asked to
-# (GhcLibProfiled = YES) or if we want GHC itself to be compiled with
-# profiling enabled (GhcProfiled = YES).
-ifneq "$(GhcLibProfiled) $(GhcProfiled)" "NO NO"
-compiler_stage2_CONFIGURE_OPTS += --enable-library-profiling
-# And if we're profiling GHC then we want lots of SCCs.
+# If we're profiling GHC then we want lots of SCCs, so -auto-all
 # We also don't want to waste time building the non-profiling library,
 # either normally or for ghci. Unfortunately this means that we have to
 # tell ghc-pkg --force as it gets upset when libHSghc-6.9.a doesn't
@@ -367,7 +362,6 @@ compiler_stage2_CONFIGURE_OPTS += --disable-library-vanilla
 compiler_stage2_CONFIGURE_OPTS += --disable-library-for-ghci
 compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force
 endif
-endif
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 # The #include is vital for the via-C route with older compilers, else the C

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1a7f25e..2be8a52 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -97,10 +97,11 @@ GhcStage1HcOpts=
 GhcStage2HcOpts=-O2
 GhcStage3HcOpts=-O2
 
-GhcProfiled=NO
 GhcDebugged=NO
 GhcDynamic=NO
-GhcLibProfiled=$(if $(filter p,$(GhcLibWays)),YES,NO)
+
+# GhcProfiled=YES means compile a profiled stage-2 compiler
+GhcProfiled=NO
 
 # Do we support shared libs?
 PlatformSupportsSharedLibs = $(if $(filter $(TARGETPLATFORM),i386-unknown-linux x86_64-unknown-linux i386-unknown-freebsd x86_64-unknown-freebsd i386-unknown-mingw32 i386-apple-darwin powerpc-apple-darwin),YES,NO)