update to current master againwip/T13904

1 files changed, 2 insertions, 148 deletions

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index bfd75ab26c..9bc6b3f278 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -51,6 +51,8 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/.
 	@echo '{-# LANGUAGE CPP #-}'                                        >> $@
 	@echo 'module Config where'                                         >> $@
 	@echo                                                               >> $@
+	@echo 'import GhcPrelude'                                           >> $@
+	@echo                                                               >> $@
 	@echo '#include "ghc_boot_platform.h"'                              >> $@
 	@echo                                                               >> $@
 	@echo 'data IntegerLibrary = IntegerGMP'                            >> $@
@@ -428,154 +430,6 @@ compiler_stage1_SplitSections = NO
 compiler_stage2_SplitSections = NO
 compiler_stage3_SplitSections = NO
 
-# There are too many symbols in the ghc package for a Windows DLL
-# (due to a limitation of bfd ld, see Trac #5987). We therefore need to split
-# some of the modules off into a separate DLL. This clump are the modules
-# reachable from DynFlags:
-compiler_stage2_dll0_START_MODULE = DynFlags
-compiler_stage2_dll0_MODULES = \
-	Annotations \
-	ApiAnnotation \
-	Avail \
-	Bag \
-	BasicTypes \
-	Binary \
-	BinFingerprint \
-	BooleanFormula \
-	BufWrite \
-	ByteCodeTypes \
-	Class \
-	CmdLineParser \
-	CmmType \
-	CoAxiom \
-	ConLike \
-	Coercion \
-	Config \
-	Constants \
-	CoreArity \
-	CoreFVs \
-	CoreSubst \
-	CoreOpt \
-	CoreSyn \
-	CoreTidy \
-	CoreUnfold \
-	CoreUtils \
-	CoreSeq \
-	CoreStats \
-	CostCentre \
-	DataCon \
-	Demand \
-	Digraph \
-	DriverPhases \
-	DynFlags \
-	Encoding \
-	EnumSet \
-	ErrUtils \
-	Exception \
-	FamInstEnv \
-	FastFunctions \
-	FastMutInt \
-	FastString \
-	FastStringEnv \
-	FieldLabel \
-	FileCleanup \
-	Fingerprint \
-	FiniteMap \
-	ForeignCall \
-	FV \
-	Hooks \
-	HsBinds \
-	HsDecls \
-	HsDoc \
-	HsExpr \
-	HsImpExp \
-	HsLit \
-	PlaceHolder \
-	HsExtension \
-	PmExpr \
-	HsPat \
-	HsSyn \
-	HsTypes \
-	HsUtils \
-	HscTypes \
-	IOEnv \
-	NameCache \
-	Id \
-	IdInfo \
-	IfaceSyn \
-	IfaceType \
-	InteractiveEvalTypes \
-	Json \
-	ToIface \
-	InstEnv \
-	Kind \
-	KnownUniques \
-	Lexeme \
-	ListSetOps \
-	Literal \
-	Maybes \
-	MkCore \
-	MkId \
-	Module \
-	MonadUtils \
-	Name \
-	NameEnv \
-	NameSet \
-	OccName \
-	OccurAnal \
-	OptCoercion \
-	OrdList \
-	Outputable \
-	PackageConfig \
-	Packages \
-	Pair \
-	Panic \
-	PatSyn \
-	PipelineMonad \
-	Platform \
-	PlatformConstants \
-	PprColour \
-	PprCore \
-	PrelNames \
-	PrelRules \
-	Pretty \
-	PrimOp \
-	RepType \
-	RdrName \
-	Rules \
-	SrcLoc \
-	StringBuffer \
-	SysTools.Terminal \
-	TcEvidence \
-	TcRnTypes \
-	TcType \
-	TrieMap \
-	TyCon \
-	Type \
-	TyCoRep \
-	TysPrim \
-	TysWiredIn \
-	Unify \
-	UniqDFM \
-	UniqDSet \
-	UniqFM \
-	UniqSet \
-	UniqSupply \
-	Unique \
-	Util \
-	Var \
-	VarEnv \
-	VarSet
-
-ifeq "$(GhcWithInterpreter)" "YES"
-# These files are reacheable from DynFlags
-# only by GHCi-enabled code (see #9552)
-compiler_stage2_dll0_MODULES += # none
-endif
-
-compiler_stage2_dll0_HS_OBJS = \
-    $(patsubst %,compiler/stage2/build/%.$(dyn_osuf),$(subst .,/,$(compiler_stage2_dll0_MODULES)))
-
 # if stage is set to something other than "1" or "", disable stage 1
 # See Note [Stage1Only vs stage=1] in mk/config.mk.in.
 ifneq "$(filter-out 1,$(stage))" ""