X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=536f246787931bc03772cf7d888d4cf07e3e9616;hb=beded1205911615ac7c1cd175def682eaf8daa1e;hp=7e17acfd88623fe1b736d80728d8ed9a85258715;hpb=38f58ecd48098c4e8b8c529a526743caad976ea1;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 7e17acf..536f246 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -576,18 +576,6 @@ endif
 #simplCore/SimplEnv_HC_OPTS = -auto-all
 #simplCore/SimplUtils_HC_OPTS = -auto-all
 
-# 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.
-ghci/InteractiveUI_HC_OPTS	= -fno-cse
-main/CmdLineOpts_HC_OPTS	= -fno-cse
-main/DriverMkDepend_HC_OPTS	= -fno-cse
-main/DriverPipeline_HC_OPTS	= -fno-cse
-main/Finder_HC_OPTS		= -fno-cse
-main/SysTools_HC_OPTS		= -fno-cse
-main/StaticFlags_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
@@ -599,10 +587,6 @@ endif
 # prototype via a global option instead of a myriad of per-file OPTIONS
 SRC_HC_OPTS += '-\#include "cutils.h"'
 
-ifeq "$(ghc_ge_605)" "NO"
-utils/LazyUniqFM_HC_OPTS += -fallow-undecidable-instances
-endif
-
 # ----------------------------------------------------------------------------
 #		Generate supporting stuff for prelude/PrimOp.lhs 
 #		from prelude/primops.txt