X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=724cbbcddbb857ecdda956a885fbb0bd27f9d1ed;hb=77a8c0dbd5c5ad90fe483cb9ddc2b6ef36d3f4d8;hp=3905677c7756af3fe8201c98635883f0d7c9f86a;hpb=dd4c28a9c706cce09ecc2c6f532969efa925532f;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 3905677..724cbbc 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.73 2000/03/31 03:09:35 hwloidl Exp $
+# $Id: Makefile,v 1.83 2000/07/14 08:17:36 simonpj Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -37,7 +37,7 @@ $(HS_PROG) :: $(HS_SRCS)
 DIRS = \
   utils basicTypes types hsSyn prelude rename typecheck deSugar coreSyn \
   specialise simplCore stranal stgSyn simplStg codeGen absCSyn main \
-  profiling parser usageSP cprAnalysis
+  profiling parser usageSP cprAnalysis javaGen
 
 
 ifeq ($(GhcWithNativeCodeGen),YES)
@@ -66,7 +66,7 @@ endif
 
 HS_OBJS  = \
   $(patsubst %.hc, %.o, $(HCS)) \
-  parser/ctypes.o parser/hschooks.o
+  parser/hschooks.o
 
 
 DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
@@ -74,7 +74,7 @@ DESTDIR       = $(INSTALL_LIBRARY_DIR_GHC)
 #
 # Add misc .c helper code (used by the frontend.)
 #
-C_SRCS += parser/ctypes.c parser/hschooks.c
+C_SRCS += parser/hschooks.c
 
 #
 # Big Fudge to get around inherent problem that Makefile setup
@@ -107,7 +107,7 @@ space:= $(empty) $(empty)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(DIRS))
+  -i$(subst $(space),:,$(DIRS)) 
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 
@@ -141,7 +141,10 @@ nativeGen/MachCode_HC_OPTS 	= -H10m
 usageSP/UsageSPInf_HC_OPTS	= -Onot
 
 prelude/PrimOp_HC_OPTS 		= -H12m -K3m
+prelude/PrelRules_HC_OPTS	= -fvia-C
+
 parser/Lex_HC_OPTS		= -fvia-C -K2m -H16m 
+parser/Ctype_HC_OPTS		= -K2m -fvia-C
 
 rename/ParseIface_HC_OPTS 	+= -Onot -H45m -K2m -fno-warn-incomplete-patterns
 rename/ParseIface_HAPPY_OPTS    += -g
@@ -186,11 +189,13 @@ typecheck/TcBinds_HC_OPTS       = -H10m
 typecheck/TcEnv_HC_OPTS		= -H10m
 utils/Argv_HC_OPTS 		= -fvia-C
 utils/SST_HC_OPTS 		= 
-utils/FastString_HC_OPTS	= 
 utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS		= -fglasgow-exts 
 utils/DirUtils_HC_OPTS 		= 
 
+# temporary, due to bug in NCG  (SDM, 1/6/2000)
+utils/FastString_HC_OPTS	= -fvia-C
+
 ifeq "$(alpha_HOST_ARCH)" "1"
 # "stbu" bug in alpha native code generator...
 basicTypes/Unique_HC_OPTS	= 
@@ -202,13 +207,13 @@ endif
 #	because it contains a 'ccall strlen', which gets inlined by
 # 	gcc, causing a lack of registers.
 #
-# -optC-funfolding-interface-threshold10
+# -optC-funfolding-interface-threshold7
 #	To stop the definition of 'strLength', which calls strlen, getting
 #	into the interface file and spreading the -monly-3-regs virus.
 #	We need -optC here because the driver before 3.02 didn't understand
 #	the -funfolding flags.
 
-utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs -optC-funfolding-interface-threshold10
+utils/PrimPacked_HC_OPTS	= -fvia-C -monly-3-regs -optC-funfolding-interface-threshold7
 
 # Strictness analyser misbehaving in 2.10, fails to terminate on
 # UpdAnal.lhs due to weird recursive datatype.  Bug was exposed by a
@@ -228,10 +233,6 @@ parser/hschooks.o : parser/hschooks.c
 	@$(RM) $@
 	$(HC) -c -o $@ $(HC_OPTS) parser/hschooks.c
 
-parser/ctypes.o : parser/ctypes.c
-	@$(RM) $@
-	$(HC) -c -o $@ $(HC_OPTS) parser/ctypes.c
-
 
 # Interface-file parser uses Happy
 SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS