X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=6385c779220b7f9ded1474f77b58e3e48f3a7dfd;hb=9fd4126858ff63ef9dc1c71f439eed11ef69f169;hp=9a71d74c93ef46e0081fdf7ebf8c2d6bf0f32baf;hpb=a368e3b80600064ca0c630fceee3b67f2b22c238;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 9a71d74..6385c77 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -52,9 +52,6 @@ count : # - for stage N, object files and .hi files are placed inside # the directory stageN, in subdirectories as per the sources. # -# - .hi-boot files are *linked* into the stageN tree, because in GHC 5.05+ -# the .hi-boot file must reside in the same place as the .hi file. -# # - we use explicit -o and -ohi options to direct the output from C & # Haskell compilations. # @@ -80,8 +77,8 @@ count : # There are other plausible designs that might work, but each has different # problems: # -# - using -odir and -hidir: GHC <= 4.08 doesn't support -hidir, and -# anyway -odir puts all the objects in one directory (strips off the +# - using -odir and -hidir: +# -odir puts all the objects in one directory (strips off the # subdirectory part), which eventually forces us to use VPATH to find # the sources. I have a really bad feeling about VPATH. # @@ -113,27 +110,6 @@ endif endif boot :: stage_dirs -# On Windows, we can't use symbolic links for the -hi-boot files -# because GHC itself is a Mingw program and does not understand -# symbolic links. So we have to copy the files instead of link them. -# That means that if you modify a .hi-boot file in Windows, you -# have to to say 'make boot' again. -# -# PS: 'ln -s foo baz' takes 'foo' relative to the path to 'baz' -# whereas 'cp foo baz' treats the two paths independently. -# Hence the "../.." in the ln command line -ifeq "$(UsingHsBoot)" "NO" -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" - for i in */*hi-boot*; do \ - cp -u -f $$i stage$(stage)/$$i; \ - done -else - for i in */*hi-boot*; do \ - ($(RM) -f stage$(stage)/$$i \ - && $(LN_S) ../../$$i stage$(stage)/$$i) || true ; \ - done -endif -endif ifeq "$(stage)" "1" HC=$(GHC) @@ -160,12 +136,7 @@ odir=stage$(stage) SRC_HC_OPTS += $(patsubst %, -i$(odir)/%, $(ALL_DIRS)) -SRC_HC_OPTS += -Wall -fno-warn-name-shadowing -# Turn off orphan warnings, but only if the flag exists (i.e. not if we -# are building stage 1 and using GHC < 6.3). -ifneq "$(stage)" "1 NO" -SRC_HC_OPTS += -fno-warn-orphans -endif +SRC_HC_OPTS += -Wall -fno-warn-name-shadowing -fno-warn-orphans HS_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(HS_SRCS)))) C_OBJS = $(patsubst %, $(odir)/%, $(addsuffix .$(way_)o,$(basename $(C_SRCS)))) @@ -283,12 +254,6 @@ $(CONFIG_HS) : $(FPTOOLS_TOP)/mk/config.mk @echo "cGHC_CP = \"$(GHC_CP)\"" >> $(CONFIG_HS) @echo "cGHC_PERL :: String" >> $(CONFIG_HS) @echo "cGHC_PERL = \"$(GHC_PERL)\"" >> $(CONFIG_HS) -ifeq ($(GhcWithIlx),YES) - @echo "cILX2IL :: String" >> $(CONFIG_HS) - @echo "cILX2IL = \"$(ILX2IL)\"" >> $(CONFIG_HS) - @echo "cILASM :: String" >> $(CONFIG_HS) - @echo "cILASM = \"$(ILASM)\"" >> $(CONFIG_HS) -endif @echo "cEnableWin32DLLs :: String" >> $(CONFIG_HS) @echo "cEnableWin32DLLs = \"$(EnableWin32DLLs)\"" >> $(CONFIG_HS) @echo "cCONTEXT_DIFF :: String" >> $(CONFIG_HS) @@ -445,16 +410,6 @@ else SRC_HC_OPTS += -DOMIT_NATIVE_CODEGEN endif -ifeq ($(GhcWithIlx),YES) -ALL_DIRS += ilxGen -SRC_HC_OPTS += -DILX -endif - -ifeq ($(GhcWithJavaGen),YES) -ALL_DIRS += javaGen -SRC_HC_OPTS += -DJAVA -endif - ifeq "$(BootingFromHc)" "YES" # HC files are always from a self-booted compiler bootstrapped = YES @@ -483,10 +438,13 @@ endif # the interpreter is supported on this platform. ifeq "$(bootstrapped)" "YES" -SRC_HC_OPTS += -package hpc -package bytestring -PKG_DEPENDS += hpc bytestring +SRC_HC_OPTS += -package bytestring +PKG_DEPENDS += bytestring endif +SRC_HC_OPTS += -package hpc +PKG_DEPENDS += hpc + ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES" # Yes, include the interepreter and Template Haskell extensions @@ -568,9 +526,13 @@ SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR) # ----------------------------------------------------------------------------- # Haskell compilations -SRC_HC_OPTS += \ - -cpp -fglasgow-exts -fno-generics -Rghc-timing \ - -I. -Iparser -Iutil +SRC_HC_OPTS += -cpp -fglasgow-exts -Rghc-timing -I. -Iparser -Iutil + +ifeq "$(ghc_ge_609)" "NO" +SRC_HC_OPTS += -fno-generics +else +SRC_HC_OPTS += -XNoGenerics +endif # Omitted: -I$(GHC_INCLUDE_DIR) # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS, @@ -581,11 +543,6 @@ SRC_HC_OPTS += \ # Disaster! Then the hc file sees the GHC 5.02 (or whatever) # include files. For the moment we've reverted to using # an explicit path in the .hs sources -# -# For the benefit of <5.00 compilers, do include GHC_INCLUDE_DIR -# when generating dependencies. (=> it gets passed onto mkdependHS, -# which needs it). -SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) # We need System.Posix (or Posix when ghc < 6.2) ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" @@ -594,20 +551,12 @@ SRC_HC_OPTS += -package Win32 PKG_DEPENDS += Win32 endif else -ifeq "$(bootstrapped) $(ghc_ge_601)" "NO NO" -SRC_HC_OPTS += -package posix -else SRC_HC_OPTS += -package unix PKG_DEPENDS += unix endif -endif -# We use the Cabal package in stages 2/3 only; in stage 1 we're using -# the libcompat library which provides the Cabal modules. -ifneq "$(stage)" "1" SRC_HC_OPTS += -package Cabal PKG_DEPENDS += Cabal -endif # Ignore lang, to avoid potential clash with the Generics module if # lang happens to be a dependency of some exposed package in the local @@ -622,41 +571,6 @@ ifeq "$(BootingFromHc)" "YES" SRC_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt) endif -# Special flags for particular modules -# The standard suffix rule for compiling a Haskell file -# adds these flags to the command line - -# There used to be a -no-recomp flag on PrimOp, but why? -# It's an expensive module to recompile! -prelude/PrimOp_HC_OPTS = -H80m - - -main/ParsePkgConf_HC_OPTS += -fno-warn-incomplete-patterns -parser/Parser_HC_OPTS += -fno-warn-incomplete-patterns - -# Careful optimisation of the parser: we don't want to throw everything -# at it, because that takes too long and doesn't buy much, but we do want -# to inline certain key external functions, so we instruct GHC not to -# throw away inlinings as it would normally do in -Onot mode: -parser/Parser_HC_OPTS += -Onot -fno-ignore-interface-pragmas - -ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9" -rename/RnMonad_HC_OPTS = -O2 -O2-for-C -endif - -utils/Digraph_HC_OPTS = -fglasgow-exts - -# basicTypes/SrcLoc_HC_OPTS = -funbox-strict-fields - -# We always optimise some low-level modules, otherwise performance of -# a non-optimised compiler is severely affected. -main/BinIface_HC_OPTS += -O -utils/Binary_HC_OPTS += -O -funbox-strict-fields -utils/FastMutInt_HC_OPTS += -O -utils/Encoding_HC_OPTS += -O -utils/StringBuffer_HC_OPTS += -O -funbox-strict-fields -utils/FastString_HC_OPTS += -O -funbox-strict-fields - # ---- Profiling ---- #simplCore/Simplify_HC_OPTS = -auto-all #simplCore/SimplEnv_HC_OPTS = -auto-all @@ -681,8 +595,6 @@ ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" main/SysTools_HC_OPTS += '-\#include ' '-\#include ' endif -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 "cutils.h"' @@ -758,13 +670,6 @@ primop-usage.hs-incl: prelude/primops.txt #----------------------------------------------------------------------------- # Linking -# Include libghccompat in stage1 only. In stage2 onwards, all these -# libraries will be available from the main libraries. - -ifeq "$(stage)" "1" -include $(GHC_COMPAT_DIR)/compat.mk -endif - ifeq "$(GhcUnregisterised)" "NO" ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux" # needed for generating proper relocation in large binaries: trac #856 @@ -860,7 +765,6 @@ endif # typecheck/TcUnify_HC_OPTS += -auto-all # coreSyn/CorePrep_HC_OPTS += -auto-all -# parser/Parser_HC_OPTS += -fasm #----------------------------------------------------------------------------- # Building the GHC package @@ -1042,7 +946,7 @@ endif # careful to recompile stuff you need if you reconfigure or change HsVersions.h. # Aargh, these don't work properly anyway, because GHC's recompilation checker -# just reports "compilation NOT required". Do we have to add -no-recomp for each +# just reports "compilation NOT required". Do we have to add -fforce-recomp for each # of these .hs files? I haven't done anything about this yet. $(odir)/codeGen/Bitmap.$(way_)o : ../includes/MachDeps.h @@ -1091,12 +995,8 @@ ifneq "$(BootingFromHc)" "YES" $(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS) endif $(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) - $(PERL) -pe 'binmode(stdin); binmode(stdout); s@(\S*[._]o)@stage$(stage)/$$1@g; s@(\S*[._]hi)@stage$(stage)/$$1@g; s@^.*/compat.*$$@@g;' <.depend-BASE >.depend-$(stage) + $(PERL) -pe 'binmode(stdin); binmode(stdout); s@(\S*[._]o)@stage$(stage)/$$1@g; s@(\S*[._]hi)@stage$(stage)/$$1@g;' <.depend-BASE >.depend-$(stage) # The binmode stuff tells perl not to add stupid ^M's to the output -# -# The /lib/compat replacement is to workaround a bug in the -# -optdep--exclude-module flag in GHC 6.4. It is not required for any -# other version of GHC, but doesn't do any harm. ifeq "$(MakefileDeps)" "YES" $(CONFIG_HS) : Makefile