X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=a4f4e2a90c7f6036fc2fbb31db9f2fdf4870eb67;hb=205383c22a13b39ed2fb9d9512d92927e53edf31;hp=a07022560c9e063d8768fcd2aa601e7c7fdc8cdd;hpb=27d13cb655147c28eeed0f06cac6fc40c5d778aa;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index a070225..a4f4e2a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -152,16 +152,26 @@ GhcCompilerWays=
 
 # Extra option flags to pass to the compiler that compiles the compiler
 # (Ones that are essential are wired into ghc/compiler/Makefile)
-# Typical ones:
-#	-H25m		allocate a bigger heap (might speed up compilation)
+# Typical options to use here:
 #
-#	-O		compile an optimised compiler
-#
-#	-DDEBUG		include consistency/assertion checks in the compiled compiler
+#	-DDEBUG		include debugging code and assertions (will make the
+#			compiler slower and produce debugging output, but useful
+#			for development)
 #
 #	-dcore-lint	check the types after every pass of the compiler;
-#			a pretty strong internal check
-GhcHcOpts=-O -Rghc-timing
+#			a pretty strong internal check of the compiler being
+#			used to compile GHC.  Useful when bootstrapping.
+GhcHcOpts=-Rghc-timing
+
+# Extra Haskell compiler options to use when compiling all Haskell
+# *programs* (not libraries), including GHC itself.
+# Typical options to use here:
+#
+#	-H25m		use a bigger heap (to speed up compilation)
+#
+#	-O		compile an optimised compiler
+#
+FptoolsHcOpts=-O
 
 # Build a compiler that will build *unregisterised* libraries and
 # binaries by default.  Unregisterised code is supposed to compile and
@@ -185,8 +195,8 @@ GhcUnregisterised=NO
 # (as well as a C backend)
 #
 # Target platforms supported:
-#   i386, alpha & sparc
-ifneq "$(findstring $(HostArch_CPP), i386 alpha sparc)" ""
+#   i386 & sparc
+ifneq "$(findstring $(HostArch_CPP), i386 sparc)" ""
 GhcWithNativeCodeGen=YES
 else
 GhcWithNativeCodeGen=NO
@@ -196,7 +206,7 @@ HaveLibDL = @HaveLibDL@
 
 # Include GHCi in the compiler.  Default to NO for the time being.
 
-ifneq "$(findstring $(HostOS_CPP), mingw32 linux solaris2 freebsd netbsd openbsd)" ""
+ifneq "$(findstring $(HostOS_CPP), mingw32 linux solaris2 freebsd netbsd openbsd osf3)" ""
 GhcWithInterpreter=YES
 ifeq "$(HaveLibDL)" "YES"
 SRC_HC_OPTS += -ldl
@@ -302,9 +312,6 @@ HsLibsFor	= ghc
 # hslibs for GHC also uses the following variables (defined above):
 #   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, DLLized, StripLibraries
 
-# Haskell compiler options for tools in fptools
-FptoolsHcOpts=-O
-
 # Build the Haskell Readline bindings?
 #
 GhcLibsWithReadline=@HaveReadlineHeaders@
@@ -658,6 +665,7 @@ FLEX_LIB		=
 # Other standard (ha!) Unix utilities
 
 AR			= @ArCmd@
+ArSupportsInput		= @ArSupportsInput@
 # Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
 BASH                    = /usr/local/bin/bash
 #
@@ -787,6 +795,12 @@ GREENCARD	        = $(FPTOOLS_TOP)/green-card/src/green-card
 BLD_DLL			= dllwrap
 
 #
+# .NET support software
+#
+ILX2IL                  = ilx2il
+ILASM                   = ilasm
+
+#
 # Happy
 #
 HAPPY			= @HappyCmd@
@@ -851,7 +865,7 @@ HSC2HS			= $(HSC2HS_PREFIX)hsc2hs-inplace
 # The ways currently defined.
 #
 ALL_WAYS=p t u s mp mg a b c d e f g h i j k l m n o A B
-USER_WAYS=a b c d e f g h i j k l m n o A B
+USER_WAYS=a b c d e f g h j k l m n o A B
 
 #
 # The following ways currently have treated specially, p u t mg,
@@ -861,6 +875,10 @@ USER_WAYS=a b c d e f g h i j k l m n o A B
 # 
 # If you want to add to these default options, fill in the variables below:
 
+# Way 'i':
+WAY_i_NAME=ILX
+WAY_i_HC_OPTS= -filx -fruntime-types
+
 # Way 'p':
 WAY_p_NAME=profiling
 WAY_p_HC_OPTS= -prof
@@ -918,9 +936,6 @@ WAY_g_HC_OPTS=
 WAY_h_NAME=
 WAY_h_HC_OPTS=
 
-WAY_i_NAME=
-WAY_i_HC_OPTS=
-
 WAY_j_NAME=
 WAY_j_HC_OPTS=
 
@@ -938,3 +953,23 @@ WAY_n_HC_OPTS=
 
 WAY_o_NAME=
 WAY_o_HC_OPTS=
+
+################################################################################
+#
+#		31-bit-Int Core files
+#
+################################################################################
+
+# 
+# It is possible to configure the compiler and prelude to support 31-bit
+# integers, suitable for a back-end and RTS using a tag bit on a 32-bit
+# architecture.  Currently the only useful output from this option is external Core
+# files.  The following additions to your build.mk will produce the
+# 31-bit core output.  Note that this is *not* just a library "way"; the
+# compiler must be built a special way too.
+
+# GhcCppOpts +=-DWORD_SIZE_IN_BITS=31
+# GhcLibHcOpts +=-fext-core -fno-code -DWORD_SIZE_IN_BITS=31
+# GhcLibCppOpts += -DWORD_SIZE_IN_BITS=31
+# SplitObjs=NO
+