X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2FMakefile;h=2f618ba645d0ab118aa74c47612eb4ee1b8ef870;hb=98744cef7b82e7eefbb1c6f1d8b9e28c415939c4;hp=1db9a456b33ba63299f407451ec2157a9d788c55;hpb=b180d2d4959b3b5b8361afc8329f40479176555b;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 1db9a45..2f618ba 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -216,7 +216,6 @@ ifeq ($(GhcWithIlx),YES)
 endif
 	@echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS)
 	@echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $(CONFIG_HS)
-	@echo "cHaveLibGmp           = \"$(HaveLibGmp)\"" >> $(CONFIG_HS)
 	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
 	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
 	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
@@ -232,7 +231,7 @@ CLEAN_FILES += $(CONFIG_HS)
 ALL_DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser cprAnalysis compMan ndpFlatten cbits
+  profiling parser cprAnalysis compMan ndpFlatten cbits iface
 
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
@@ -345,7 +344,9 @@ endif
 #	The standard suffix rule for compiling a Haskell file
 #	adds these flags to the command line
 
-prelude/PrimOp_HC_OPTS 		= -no-recomp -H80m
+# There used to be a -no-recomp flag on PrimOp, but why?
+# It's an expensive module to recompile!
+prelude/PrimOp_HC_OPTS 		= -H80m
 
 # because the NCG can't handle the 64-bit math in here
 prelude/PrelRules_HC_OPTS	= -fvia-C
@@ -411,6 +412,8 @@ endif
 # Required due to use of Concurrent.myThreadId
 utils/Panic_HC_OPTS += -fvia-C
 
+parser/Lexer_HC_OPTS += -funbox-strict-fields
+
 # ghc_strlen percolates through so many modules that it is easier to get its
 # prototype via a global option instead of a myriad of per-file OPTIONS
 SRC_HC_OPTS += '-\#include "hschooks.h"'
@@ -473,12 +476,6 @@ primop-usage.hs-incl: prelude/primops.txt
 	$(GENPOC) --usage              < $< > $@
 
 
-
-# ----------------------------------------------------------------------------
-#		Parsers/lexers
-
-SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS
-
 #-----------------------------------------------------------------------------
 # 		Linking
 
@@ -518,45 +515,47 @@ endif
 # ----------------------------------------------------------------------------
 # profiling.
 
-rename/RnBinds_HC_OPTS += -auto-all
-rename/RnEnv_HC_OPTS += -auto-all
-rename/RnExpr_HC_OPTS += -auto-all
-rename/RnHiFiles_HC_OPTS += -auto-all
-rename/RnHsSyn_HC_OPTS += -auto-all
-rename/Rename_HC_OPTS += -auto-all
-rename/RnIfaces_HC_OPTS += -auto-all
-rename/RnNames_HC_OPTS += -auto-all
-rename/RnSource_HC_OPTS += -auto-all
-rename/RnTypes_HC_OPTS += -auto-all
-
-typecheck/Inst_HC_OPTS += -auto-all
-typecheck/TcBinds_HC_OPTS += -auto-all
-typecheck/TcClassDcl_HC_OPTS += -auto-all
-typecheck/TcDefaults_HC_OPTS += -auto-all
-typecheck/TcDeriv_HC_OPTS += -auto-all
-typecheck/TcEnv_HC_OPTS += -auto-all
-typecheck/TcExpr_HC_OPTS += -auto-all
-typecheck/TcForeign_HC_OPTS += -auto-all
-typecheck/TcGenDeriv_HC_OPTS += -auto-all
-typecheck/TcHsSyn_HC_OPTS += -auto-all
-typecheck/TcIfaceSig_HC_OPTS += -auto-all
-typecheck/TcInstDcls_HC_OPTS += -auto-all
-typecheck/TcMatches_HC_OPTS += -auto-all
-typecheck/TcMonoType_HC_OPTS += -auto-all
-typecheck/TcMType_HC_OPTS += -auto-all
-typecheck/TcPat_HC_OPTS += -auto-all
-typecheck/TcRnDriver_HC_OPTS += -auto-all
-#typecheck/TcRnMonad_HC_OPTS += -auto-all
-#typecheck/TcRnTypes_HC_OPTS += -auto-all
-typecheck/TcRules_HC_OPTS += -auto-all
-typecheck/TcSimplify_HC_OPTS += -auto-all
-typecheck/TcSplice_HC_OPTS += -auto-all
-typecheck/TcTyClsDecls_HC_OPTS += -auto-all
-typecheck/TcTyDecls_HC_OPTS += -auto-all
-typecheck/TcType_HC_OPTS += -auto-all
-typecheck/TcUnify_HC_OPTS += -auto-all
-
-absCSyn/PprAbsC_HC_OPTS += -auto-all
+# rename/RnBinds_HC_OPTS += -auto-all
+# rename/RnEnv_HC_OPTS += -auto-all
+# rename/RnExpr_HC_OPTS += -auto-all
+# rename/RnHiFiles_HC_OPTS += -auto-all
+# rename/RnHsSyn_HC_OPTS += -auto-all
+# rename/Rename_HC_OPTS += -auto-all
+# rename/RnIfaces_HC_OPTS += -auto-all
+# rename/RnNames_HC_OPTS += -auto-all
+# rename/RnSource_HC_OPTS += -auto-all
+# rename/RnTypes_HC_OPTS += -auto-all
+# 
+# typecheck/Inst_HC_OPTS += -auto-all
+# typecheck/TcBinds_HC_OPTS += -auto-all
+# typecheck/TcClassDcl_HC_OPTS += -auto-all
+# typecheck/TcDefaults_HC_OPTS += -auto-all
+# typecheck/TcDeriv_HC_OPTS += -auto-all
+# typecheck/TcEnv_HC_OPTS += -auto-all
+# typecheck/TcExpr_HC_OPTS += -auto-all
+# typecheck/TcForeign_HC_OPTS += -auto-all
+# typecheck/TcGenDeriv_HC_OPTS += -auto-all
+# typecheck/TcHsSyn_HC_OPTS += -auto-all
+# typecheck/TcIfaceSig_HC_OPTS += -auto-all
+# typecheck/TcInstDcls_HC_OPTS += -auto-all
+# typecheck/TcMatches_HC_OPTS += -auto-all
+# typecheck/TcMonoType_HC_OPTS += -auto-all
+# typecheck/TcMType_HC_OPTS += -auto-all
+# typecheck/TcPat_HC_OPTS += -auto-all
+# typecheck/TcRnDriver_HC_OPTS += -auto-all
+# #typecheck/TcRnMonad_HC_OPTS += -auto-all
+# #typecheck/TcRnTypes_HC_OPTS += -auto-all
+# typecheck/TcRules_HC_OPTS += -auto-all
+# typecheck/TcSimplify_HC_OPTS += -auto-all
+# typecheck/TcSplice_HC_OPTS += -auto-all
+# typecheck/TcTyClsDecls_HC_OPTS += -auto-all
+# typecheck/TcTyDecls_HC_OPTS += -auto-all
+# typecheck/TcType_HC_OPTS += -auto-all
+# typecheck/TcUnify_HC_OPTS += -auto-all
+# 
+# absCSyn/PprAbsC_HC_OPTS += -auto-all
+
+coreSyn/CorePrep_HC_OPTS += -auto-all
 
 #-----------------------------------------------------------------------------
 # 		clean