__GLASGOW_HASKELL__ >= 609 is now always true
[ghc-hetmet.git] / compiler / ghc.mk
index 901b069..65193ce 100644 (file)
@@ -67,6 +67,8 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
        @echo "cGhcWithInterpreter   = \"$(GhcWithInterpreter)\"" >> $@
        @echo "cGhcWithNativeCodeGen :: String" >> $@
        @echo "cGhcWithNativeCodeGen = \"$(GhcWithNativeCodeGen)\"" >> $@
+       @echo "cGhcWithLlvmCodeGen   :: String" >> $@
+       @echo "cGhcWithLlvmCodeGen   = \"YES\"" >> $@
        @echo "cGhcWithSMP           :: String" >> $@
        @echo "cGhcWithSMP           = \"$(GhcWithSMP)\"" >> $@
        @echo "cGhcRTSWays           :: String" >> $@
@@ -109,18 +111,8 @@ $(compiler_CONFIG_HS) : mk/config.mk mk/project.mk
        @echo "cGHC_SYSMAN_PGM       = \"$(GHC_SYSMAN)\"" >> $@
        @echo "cGHC_SYSMAN_DIR       :: String" >> $@
        @echo "cGHC_SYSMAN_DIR       = \"$(GHC_SYSMAN_DIR)\"" >> $@
-       @echo "cGHC_CP               :: String" >> $@
-       @echo "cGHC_CP               = \"$(GHC_CP)\"" >> $@
        @echo "cGHC_PERL             :: String" >> $@
        @echo "cGHC_PERL             = \"$(GHC_PERL)\"" >> $@
-       @echo "cEnableWin32DLLs      :: String" >> $@
-       @echo "cEnableWin32DLLs      = \"$(EnableWin32DLLs)\"" >> $@
-       @echo "cCONTEXT_DIFF         :: String" >> $@
-       @echo "cCONTEXT_DIFF         = \"$(CONTEXT_DIFF)\"" >> $@
-       @echo "cUSER_WAY_NAMES       :: String" >> $@
-       @echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $@
-       @echo "cUSER_WAY_OPTS        :: String" >> $@
-       @echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $@
        @echo "cDEFAULT_TMPDIR       :: String" >> $@
        @echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $@
        @echo "cRelocatableBuild     :: Bool"                 >> $@
@@ -152,44 +144,44 @@ PLATFORM_H = ghc_boot_platform.h
 compiler/stage1/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/.
        "$(RM)" $(RM_OPTS) $@
        @echo "Creating $@..."
-       @echo "#ifndef __PLATFORM_H__"  >$@
-       @echo "#define __PLATFORM_H__" >>$@
-       @echo >> $@
+       @echo "#ifndef __PLATFORM_H__"                           >> $@
+       @echo "#define __PLATFORM_H__"                           >> $@
+       @echo                                                    >> $@
        @echo "#define BuildPlatform_NAME  \"$(BUILDPLATFORM)\"" >> $@
-       @echo "#define HostPlatform_NAME   \"$(HOSTPLATFORM)\"" >> $@
-       @echo "#define TargetPlatform_NAME \"$(TARGETPLATFORM)\"" >> $@
-       @echo >> $@
-       @echo "#define $(BuildPlatform_CPP)_BUILD       1" >> $@
-       @echo "#define $(HostPlatform_CPP)_HOST         1" >> $@
-       @echo "#define $(TargetPlatform_CPP)_TARGET     1" >> $@
-       @echo >> $@
-       @echo "#define $(BuildArch_CPP)_BUILD_ARCH      1" >> $@
-       @echo "#define $(HostArch_CPP)_HOST_ARCH        1" >> $@
-       @echo "#define $(TargetArch_CPP)_TARGET_ARCH    1" >> $@
-       @echo "#define BUILD_ARCH \"$(BuildArch_CPP)\"" >> $@
-       @echo "#define HOST_ARCH \"$(HostArch_CPP)\"" >> $@
-       @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@
-       @echo >> $@
-       @echo "#define $(BuildOS_CPP)_BUILD_OS          1" >> $@
-       @echo "#define $(HostOS_CPP)_HOST_OS            1" >> $@
-       @echo "#define $(TargetOS_CPP)_TARGET_OS        1" >> $@  
-       @echo "#define BUILD_OS \"$(BuildOS_CPP)\"" >> $@
-       @echo "#define HOST_OS \"$(HostOS_CPP)\"" >> $@
-       @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@
+       @echo "#define HostPlatform_NAME   \"$(BUILDPLATFORM)\"" >> $@
+       @echo "#define TargetPlatform_NAME \"$(HOSTPLATFORM)\""  >> $@
+       @echo                                                    >> $@
+       @echo "#define $(BuildPlatform_CPP)_BUILD 1"             >> $@
+       @echo "#define $(BuildPlatform_CPP)_HOST 1"              >> $@
+       @echo "#define $(HostPlatform_CPP)_TARGET 1"             >> $@
+       @echo                                                    >> $@
+       @echo "#define $(BuildArch_CPP)_BUILD_ARCH 1"            >> $@
+       @echo "#define $(BuildArch_CPP)_HOST_ARCH 1"             >> $@
+       @echo "#define $(HostArch_CPP)_TARGET_ARCH 1"            >> $@
+       @echo "#define BUILD_ARCH \"$(BuildArch_CPP)\""          >> $@
+       @echo "#define HOST_ARCH \"$(BuildArch_CPP)\""           >> $@
+       @echo "#define TARGET_ARCH \"$(HostArch_CPP)\""          >> $@
+       @echo                                                    >> $@
+       @echo "#define $(BuildOS_CPP)_BUILD_OS 1"                >> $@
+       @echo "#define $(BuildOS_CPP)_HOST_OS 1"                 >> $@
+       @echo "#define $(HostOS_CPP)_TARGET_OS 1"                >> $@
+       @echo "#define BUILD_OS \"$(BuildOS_CPP)\""              >> $@
+       @echo "#define HOST_OS \"$(BuildOS_CPP)\""               >> $@
+       @echo "#define TARGET_OS \"$(HostOS_CPP)\""              >> $@
 ifeq "$(HostOS_CPP)" "irix"
-       @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS           " >> $@  
-       @echo "#define $(IRIX_MAJOR)_TARGET_OS          1" >> $@  
-       @echo "#endif                                    " >> $@  
+       @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS"                  >> $@
+       @echo "#define $(IRIX_MAJOR)_TARGET_OS 1"                >> $@
+       @echo "#endif"                                           >> $@
 endif
-       @echo >> $@
-       @echo "#define $(BuildVendor_CPP)_BUILD_VENDOR  1" >> $@
-       @echo "#define $(HostVendor_CPP)_HOST_VENDOR    1" >> $@
-       @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR  1" >> $@
-       @echo "#define BUILD_VENDOR \"$(BuildVendor_CPP)\"" >> $@
-       @echo "#define HOST_VENDOR \"$(HostVendor_CPP)\"" >> $@
-       @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@
-       @echo >> $@
-       @echo "#endif /* __PLATFORM_H__ */"          >> $@
+       @echo                                                    >> $@
+       @echo "#define $(BuildVendor_CPP)_BUILD_VENDOR 1"        >> $@
+       @echo "#define $(BuildVendor_CPP)_HOST_VENDOR 1"         >> $@
+       @echo "#define $(HostVendor_CPP)_TARGET_VENDOR 1"        >> $@
+       @echo "#define BUILD_VENDOR \"$(BuildVendor_CPP)\""      >> $@
+       @echo "#define HOST_VENDOR \"$(BuildVendor_CPP)\""       >> $@
+       @echo "#define TARGET_VENDOR \"$(HostVendor_CPP)\""      >> $@
+       @echo                                                    >> $@
+       @echo "#endif /* __PLATFORM_H__ */"                      >> $@
        @echo "Done."
 
 # For stage2 and above, the BUILD platform is the HOST of stage1, and
@@ -198,44 +190,44 @@ endif
 compiler/stage2/$(PLATFORM_H) : mk/config.mk mk/project.mk | $$(dir $$@)/.
        "$(RM)" $(RM_OPTS) $@
        @echo "Creating $@..."
-       @echo "#ifndef __PLATFORM_H__"  >$@
-       @echo "#define __PLATFORM_H__" >>$@
-       @echo >> $@
-       @echo "#define BuildPlatform_NAME  \"$(HOSTPLATFORM)\"" >> $@
-       @echo "#define HostPlatform_NAME   \"$(TARGETPLATFORM)\"" >> $@
+       @echo "#ifndef __PLATFORM_H__"                            >> $@
+       @echo "#define __PLATFORM_H__"                            >> $@
+       @echo                                                     >> $@
+       @echo "#define BuildPlatform_NAME  \"$(BUILDPLATFORM)\""  >> $@
+       @echo "#define HostPlatform_NAME   \"$(HOSTPLATFORM)\""   >> $@
        @echo "#define TargetPlatform_NAME \"$(TARGETPLATFORM)\"" >> $@
-       @echo >> $@
-       @echo "#define $(HostPlatform_CPP)_BUILD        1" >> $@
-       @echo "#define $(TargetPlatform_CPP)_HOST               1" >> $@
-       @echo "#define $(TargetPlatform_CPP)_TARGET     1" >> $@
-       @echo >> $@
-       @echo "#define $(HostArch_CPP)_BUILD_ARCH       1" >> $@
-       @echo "#define $(TargetArch_CPP)_HOST_ARCH      1" >> $@
-       @echo "#define $(TargetArch_CPP)_TARGET_ARCH    1" >> $@
-       @echo "#define BUILD_ARCH \"$(HostArch_CPP)\"" >> $@
-       @echo "#define HOST_ARCH \"$(TargetArch_CPP)\"" >> $@
-       @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\"" >> $@
-       @echo >> $@
-       @echo "#define $(HostOS_CPP)_BUILD_OS           1" >> $@
-       @echo "#define $(TargetOS_CPP)_HOST_OS          1" >> $@
-       @echo "#define $(TargetOS_CPP)_TARGET_OS        1" >> $@  
-       @echo "#define BUILD_OS \"$(HostOS_CPP)\"" >> $@
-       @echo "#define HOST_OS \"$(TargetOS_CPP)\"" >> $@
-       @echo "#define TARGET_OS \"$(TargetOS_CPP)\"" >> $@
-ifeq "$(HostOS_CPP)" "irix"
-       @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS           " >> $@  
-       @echo "#define $(IRIX_MAJOR)_TARGET_OS          1" >> $@  
-       @echo "#endif                                    " >> $@  
+       @echo                                                     >> $@
+       @echo "#define $(BuildPlatform_CPP)_BUILD 1"              >> $@
+       @echo "#define $(HostPlatform_CPP)_HOST 1"                >> $@
+       @echo "#define $(TargetPlatform_CPP)_TARGET 1"            >> $@
+       @echo                                                     >> $@
+       @echo "#define $(BuildArch_CPP)_BUILD_ARCH 1"             >> $@
+       @echo "#define $(HostArch_CPP)_HOST_ARCH 1"               >> $@
+       @echo "#define $(TargetArch_CPP)_TARGET_ARCH 1"           >> $@
+       @echo "#define BUILD_ARCH \"$(HostArch_CPP)\""            >> $@
+       @echo "#define HOST_ARCH \"$(HostArch_CPP)\""             >> $@
+       @echo "#define TARGET_ARCH \"$(TargetArch_CPP)\""         >> $@
+       @echo                                                     >> $@
+       @echo "#define $(HostOS_CPP)_BUILD_OS 1"                  >> $@
+       @echo "#define $(HostOS_CPP)_HOST_OS 1"                   >> $@
+       @echo "#define $(TargetOS_CPP)_TARGET_OS 1"               >> $@
+       @echo "#define BUILD_OS \"$(HostOS_CPP)\""                >> $@
+       @echo "#define HOST_OS \"$(HostOS_CPP)\""                 >> $@
+       @echo "#define TARGET_OS \"$(TargetOS_CPP)\""             >> $@
+ifeq "$(TargetOS_CPP)" "irix"
+       @echo "#ifndef $(IRIX_MAJOR)_TARGET_OS"                   >> $@
+       @echo "#define $(IRIX_MAJOR)_TARGET_OS 1"                 >> $@
+       @echo "#endif"                                            >> $@
 endif
-       @echo >> $@
-       @echo "#define $(HostVendor_CPP)_BUILD_VENDOR   1" >> $@
-       @echo "#define $(TargetVendor_CPP)_HOST_VENDOR  1" >> $@
-       @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR  1" >> $@
-       @echo "#define BUILD_VENDOR \"$(HostVendor_CPP)\"" >> $@
-       @echo "#define HOST_VENDOR \"$(TargetVendor_CPP)\"" >> $@
-       @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\"" >> $@
-       @echo >> $@
-       @echo "#endif /* __PLATFORM_H__ */"          >> $@
+       @echo                                                     >> $@
+       @echo "#define $(BuildVendor_CPP)_BUILD_VENDOR 1"         >> $@
+       @echo "#define $(HostVendor_CPP)_HOST_VENDOR 1"           >> $@
+       @echo "#define $(TargetVendor_CPP)_TARGET_VENDOR  1"      >> $@
+       @echo "#define BUILD_VENDOR \"$(BuildVendor_CPP)\""       >> $@
+       @echo "#define HOST_VENDOR \"$(HostVendor_CPP)\""         >> $@
+       @echo "#define TARGET_VENDOR \"$(TargetVendor_CPP)\""     >> $@
+       @echo                                                     >> $@
+       @echo "#endif /* __PLATFORM_H__ */"                       >> $@
        @echo "Done."
 
 compiler/stage3/$(PLATFORM_H) : compiler/stage2/$(PLATFORM_H)
@@ -344,10 +336,8 @@ compiler_CONFIGURE_OPTS += --ld-options=-E
 endif
 
 ifeq "$(GhcUnregisterised)" "NO"
-ifeq "$(HOSTPLATFORM)" "ia64-unknown-linux"
-# needed for generating proper relocation in large binaries: trac #856
-compiler_CONFIGURE_OPTS += --ld-option=-Wl,--relax
-endif
+else
+compiler_CONFIGURE_OPTS += --ghc-option=-DNO_REGS
 endif
 
 # We need to turn on profiling either if we have been asked to
@@ -395,11 +385,7 @@ compiler_stage3_CONFIGURE_OPTS := $(compiler_stage2_CONFIGURE_OPTS)
 compiler_stage1_CONFIGURE_OPTS += --ghc-option=-DSTAGE=1
 compiler_stage2_CONFIGURE_OPTS += --ghc-option=-DSTAGE=2
 compiler_stage3_CONFIGURE_OPTS += --ghc-option=-DSTAGE=3
-compiler_stage2_HADDOCK_OPTS += --haddock-option=--optghc=-DSTAGE=2
-
-compiler_stage1_CONFIGURE_OPTS += --ghc-options='$(GhcStage1HcOpts)'
-compiler_stage2_CONFIGURE_OPTS += --ghc-options='$(GhcStage2HcOpts)'
-compiler_stage3_CONFIGURE_OPTS += --ghc-options='$(GhcStage3HcOpts)'
+compiler_stage2_HADDOCK_OPTS += --optghc=-DSTAGE=2
 
 compiler/stage1/package-data.mk : compiler/ghc.mk
 compiler/stage2/package-data.mk : compiler/ghc.mk
@@ -449,24 +435,31 @@ compiler_stage1_SplitObjs = NO
 compiler_stage2_SplitObjs = NO
 compiler_stage3_SplitObjs = NO
 
-# For now, bindists always use stage 2
-ifneq "$(BINDIST)" "YES"
-# stage 1 is enabled unless $(stage) is set to something other than 1
-ifeq "$(filter-out 1,$(stage))" ""
-$(eval $(call build-package,compiler,stage1,0))
+# if stage is set to something other than "1" or "", disable stage 1
+ifneq "$(filter-out 1,$(stage))" ""
+compiler_stage1_NOT_NEEDED = YES
 endif
+# if stage is set to something other than "2" or "", disable stage 2
+ifneq "$(filter-out 2,$(stage))" ""
+compiler_stage2_NOT_NEEDED = YES
 endif
-
-# stage 2 is enabled unless $(stage) is set to something other than 2
-ifeq "$(filter-out 2,$(stage))" ""
-$(eval $(call build-package,compiler,stage2,1))
+# stage 3 has to be requested explicitly with stage=3
+ifneq "$(stage)" "3"
+compiler_stage3_NOT_NEEDED = YES
 endif
+$(eval $(call build-package,compiler,stage1,0))
+$(eval $(call build-package,compiler,stage2,1))
+$(eval $(call build-package,compiler,stage3,2))
+
+# after build-package, because that sets compiler_stage1_HC_OPTS:
+compiler_stage1_HC_OPTS += $(GhcStage1HcOpts)
+compiler_stage2_HC_OPTS += $(GhcStage2HcOpts)
+compiler_stage3_HC_OPTS += $(GhcStage3HcOpts)
 
 ifneq "$(BINDIST)" "YES"
-# stage 3 has to be requested explicitly with stage=3
-ifeq "$(stage)" "3"
-$(eval $(call build-package,compiler,stage3,2))
-endif
+
+compiler_stage2_TAGS_HC_OPTS = -package ghc
+$(eval $(call tags-package,compiler,stage2))
 
 $(compiler_stage1_depfile_haskell) : compiler/stage1/$(PLATFORM_H)
 $(compiler_stage2_depfile_haskell) : compiler/stage2/$(PLATFORM_H)
@@ -484,9 +477,16 @@ $(eval $(call compiler-hs-dependency,PrimOp,$(PRIMOP_BITS)))
 
 # GHC itself doesn't know about the above dependencies, so we have to
 # switch off the recompilation checker for those modules:
-compiler/prelude/PrimOps_HC_OPTS += -fforce-recomp
+compiler/prelude/PrimOp_HC_OPTS  += -fforce-recomp
 compiler/main/Constants_HC_OPTS  += -fforce-recomp
 
+# Workaround for #4003 in GHC 6.12.2.  It didn't happen in 6.12.1, and
+# will be fixed in 6.12.3.  Unfortunately we don't have a way to do
+# this for just stage1 in the build system.
+ifeq "$(GhcVersion)" "6.12.2"
+compiler/hsSyn/HsLit_HC_OPTS     += -fomit-interface-pragmas
+endif
+
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.