diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | aclocal.m4 | 7 | ||||
| -rw-r--r-- | compiler/ghc.mk | 4 | ||||
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 28 | ||||
| -rw-r--r-- | docs/users_guide/phases.xml | 79 | ||||
| -rw-r--r-- | ghc.mk | 1 | ||||
| -rw-r--r-- | includes/ghc.mk | 39 | ||||
| -rw-r--r-- | mk/project.mk.in | 2 |
8 files changed, 150 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore index d578d5c945..19b55b20ee 100644 --- a/.gitignore +++ b/.gitignore @@ -103,6 +103,7 @@ _darcs/ /ghc/ghc-bin.cabal /includes/ghcautoconf.h /includes/ghcplatform.h +/includes/ghcversion.h /index.html /inplace/ /libffi/build/ diff --git a/aclocal.m4 b/aclocal.m4 index 62cf6fe4e9..a98691ef57 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1604,6 +1604,13 @@ AC_SUBST([ProjectVersionInt]) # The project patchlevel is zero unless stated otherwise test -z "$ProjectPatchLevel" && ProjectPatchLevel=0 +# Save split version of ProjectPatchLevel +ProjectPatchLevel1=`echo $ProjectPatchLevel | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\1/'` +ProjectPatchLevel2=`echo $ProjectPatchLevel | sed 's/^\(@<:@^.@:>@*\)\(\.\{0,1\}\(.*\)\)$/\3/'` + +AC_SUBST([ProjectPatchLevel1]) +AC_SUBST([ProjectPatchLevel2]) + # Remove dots from the patch level; this allows us to have versions like 6.4.1.20050508 ProjectPatchLevel=`echo $ProjectPatchLevel | sed 's/\.//'` diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 8e00149c42..0f9896066d 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -71,6 +71,10 @@ compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/. @echo 'cProjectVersionInt = "$(ProjectVersionInt)"' >> $@ @echo 'cProjectPatchLevel :: String' >> $@ @echo 'cProjectPatchLevel = "$(ProjectPatchLevel)"' >> $@ + @echo 'cProjectPatchLevel1 :: String' >> $@ + @echo 'cProjectPatchLevel1 = "$(ProjectPatchLevel1)"' >> $@ + @echo 'cProjectPatchLevel2 :: String' >> $@ + @echo 'cProjectPatchLevel2 = "$(ProjectPatchLevel2)"' >> $@ @echo 'cBooterVersion :: String' >> $@ @echo 'cBooterVersion = "$(GhcVersion)"' >> $@ @echo 'cStage :: String' >> $@ diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index ca720070c0..562c7d74be 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1089,6 +1089,8 @@ runPhase (RealPhase cc_phase) input_fn dflags -- very weakly typed, being derived from C--. ["-fno-strict-aliasing"] + ghcVersionH <- liftIO $ getGhcVersionPathName dflags + let gcc_lang_opt | cc_phase `eqPhase` Ccpp = "c++" | cc_phase `eqPhase` Cobjc = "objective-c" | cc_phase `eqPhase` Cobjcpp = "objective-c++" @@ -1138,7 +1140,9 @@ runPhase (RealPhase cc_phase) input_fn dflags ++ verbFlags ++ [ "-S" ] ++ cc_opt - ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] + ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt + , "-include", ghcVersionH + ] ++ framework_paths ++ split_opt ++ include_paths @@ -2092,6 +2096,13 @@ doCpp dflags raw input_fn output_fn = do backend_defs <- getBackendDefs dflags + -- Default CPP defines in Haskell source + ghcVersionH <- getGhcVersionPathName dflags + let hsSourceCppOpts = + [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt + , "-include", ghcVersionH + ] + cpp_prog ( map SysTools.Option verbFlags ++ map SysTools.Option include_paths ++ map SysTools.Option hsSourceCppOpts @@ -2129,11 +2140,6 @@ getBackendDefs dflags | hscTarget dflags == HscLlvm = do getBackendDefs _ = return [] -hsSourceCppOpts :: [String] --- Default CPP defines in Haskell source -hsSourceCppOpts = - [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt ] - -- --------------------------------------------------------------------------- -- join object files into a single relocatable object file, using ld -r @@ -2213,6 +2219,16 @@ haveRtsOptsFlags dflags = RtsOptsSafeOnly -> False _ -> True +-- | Find out path to @ghcversion.h@ file +getGhcVersionPathName :: DynFlags -> IO FilePath +getGhcVersionPathName dflags = do + dirs <- getPackageIncludePath dflags [rtsPackageKey] + + found <- filterM doesFileExist (map (</> "ghcversion.h") dirs) + case found of + [] -> throwGhcExceptionIO (InstallationError ("ghcversion.h missing")) + (x:_) -> return x + -- Note [-fPIC for assembler] -- When compiling .c source file GHC's driver pipeline basically -- does the following two things: diff --git a/docs/users_guide/phases.xml b/docs/users_guide/phases.xml index 095de32516..085ebbf509 100644 --- a/docs/users_guide/phases.xml +++ b/docs/users_guide/phases.xml @@ -389,6 +389,85 @@ $ cat foo.hspp</screen> <varlistentry> <term> + <constant>__GLASGOW_HASKELL_PATCHLEVEL1__</constant> + <indexterm><primary><constant>__GLASGOW_HASKELL_PATCHLEVEL1__</constant></primary></indexterm> + </term> + <term> + <constant>__GLASGOW_HASKELL_PATCHLEVEL2__</constant> + <indexterm><primary><constant>__GLASGOW_HASKELL_PATCHLEVEL2__</constant></primary></indexterm> + </term> + <listitem> + <para>These macros are available starting with GHC 7.10.1.</para> + + <para>For three-part GHC version numbers + <literal><replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable></literal>, + the value of + <constant>__GLASGOW_HASKELL_PATCHLEVEL1__</constant> + is the integer <replaceable>z</replaceable>.</para> + + <para>For four-part GHC version numbers + <literal><replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable>.<replaceable>z'</replaceable></literal>, + the value of + <constant>__GLASGOW_HASKELL_PATCHLEVEL1__</constant> + is the integer <replaceable>z</replaceable> while the value of + <constant>__GLASGOW_HASKELL_PATCHLEVEL2__</constant> + is set to the integer <replaceable>z'</replaceable>.</para> + + <para>These macros are provided for allowing finer + granularity than is provided by + <literal>__GLASGOW_HASKELL__</literal>. Usually, this should + not be necessary as it's expected for most APIs to remain + stable between patchlevel releases, but occasionally + internal API changes are necessary to fix bugs. Also + conditional compilation on the patchlevel can be useful for + working around bugs in older releases.</para> + + <para>NB. These macros are set when pre-processing both + Haskell source and C source, including the C source + generated from a Haskell module + (i.e. <filename>.hs</filename>, <filename>.lhs</filename>, + <filename>.c</filename> and <filename>.hc</filename> + files).</para> + </listitem> + </varlistentry> + + <varlistentry> + <term> + <constant>MIN_VERSION_GLASGOW_HASKELL(<replaceable>x</replaceable>,<replaceable>y</replaceable>,<replaceable>z</replaceable>,<replaceable>z'</replaceable>)</constant> + <indexterm><primary><constant>MIN_VERSION_GLASGOW_HASKELL</constant></primary></indexterm> + </term> + <listitem> + <para>This macro is available starting with GHC 7.10.1.</para> + + <para>This macro is provided for convenience to write CPP + conditionals testing whether the GHC version used is version + <literal><replaceable>x</replaceable>.<replaceable>y</replaceable>.<replaceable>z</replaceable>.<replaceable>z'</replaceable></literal> + or later.</para> + + <para>If compatibility with Haskell compilers (including GHC + prior to version 7.10.1) which do not define + <literal>MIN_VERSION_GLASGOW_HASKELL</literal> is required, + the presence of the + <literal>MIN_VERSION_GLASGOW_HASKELL</literal> macro needs + to be ensured before it is called, e.g.:</para> + +<programlisting>#ifdef MIN_VERSION_GLASGOW_HASKELL +#if MIN_VERSION_GLASGOW_HASKELL(7,10,2,0) +/* code that applies only to GHC 7.10.2 or later */ +#endif +#endif</programlisting> + + <para>NB. This macro is set when pre-processing both + Haskell source and C source, including the C source + generated from a Haskell module + (i.e. <filename>.hs</filename>, <filename>.lhs</filename>, + <filename>.c</filename> and <filename>.hc</filename> + files).</para> + </listitem> + </varlistentry> + + <varlistentry> + <term> <constant>__GLASGOW_HASKELL_LLVM__</constant> <indexterm><primary><constant>__GLASGOW_HASKELL_LLVM__</constant></primary></indexterm> </term> @@ -1223,6 +1223,7 @@ CLEAN_FILES += includes/GHCConstants.h CLEAN_FILES += includes/DerivedConstants.h CLEAN_FILES += includes/ghcautoconf.h CLEAN_FILES += includes/ghcplatform.h +CLEAN_FILES += includes/ghcversion.h CLEAN_FILES += utils/ghc-pkg/Version.hs CLEAN_FILES += compiler/parser/Parser.y CLEAN_FILES += compiler/prelude/primops.txt diff --git a/includes/ghc.mk b/includes/ghc.mk index 5342cc8c02..f0bfbec0da 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -16,6 +16,7 @@ # XXX: these should go in includes/dist/build? includes_H_CONFIG = includes/ghcautoconf.h includes_H_PLATFORM = includes/ghcplatform.h +includes_H_VERSION = includes/ghcversion.h # # All header files are in includes/{one of these subdirectories} @@ -53,6 +54,34 @@ ifeq "$(DYNAMIC_BY_DEFAULT)" "YES" includes_CC_OPTS += -DDYNAMIC_BY_DEFAULT endif + +$(includes_H_VERSION) : mk/project.mk | $$(dir $$@)/. + @echo "Creating $@..." + @echo "#ifndef __GHCVERSION_H__" > $@ + @echo "#define __GHCVERSION_H__" >> $@ + @echo >> $@ + @echo "#ifndef __GLASGOW_HASKELL__" >> $@ + @echo "# define __GLASGOW_HASKELL__ $(ProjectVersionInt)" >> $@ + @echo "#endif" >> $@ + @echo >> $@ + @if [ -n "$(ProjectPatchLevel1)" ]; then \ + echo "#define __GLASGOW_HASKELL_PATCHLEVEL1__ $(ProjectPatchLevel1)" >> $@; \ + fi + @if [ -n "$(ProjectPatchLevel2)" ]; then \ + echo "#define __GLASGOW_HASKELL_PATCHLEVEL1__ $(ProjectPatchLevel2)" >> $@; \ + fi + @echo >> $@ + @echo '#define MIN_VERSION_GLASGOW_HASKELL(ma,mi,pl1,pl2) (\\' >> $@ + @echo ' ((ma)*100+(mi)) < __GLASGOW_HASKELL__ || \\' >> $@ + @echo ' ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \\' >> $@ + @echo ' && (pl1) < __GLASGOW_HASKELL_PATCHLEVEL1__ || \\'>> $@ + @echo ' ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \\' >> $@ + @echo ' && (pl1) == __GLASGOW_HASKELL_PATCHLEVEL1__ \\' >> $@ + @echo ' && (pl2) <= __GLASGOW_HASKELL_PATCHLEVEL2__ )' >> $@ + @echo >> $@ + @echo "#endif /* __GHCVERSION_H__ */" >> $@ + @echo "Done." + ifneq "$(BINDIST)" "YES" ifeq "$(PORTING_HOST)" "YES" @@ -160,8 +189,8 @@ DERIVE_CONSTANTS_FLAGS += $(addprefix --gcc-flag$(space),$(includes_CC_OPTS) -fc DERIVE_CONSTANTS_FLAGS += --nm-program "$(NM)" ifneq "$(BINDIST)" "YES" -$(includes_DERIVEDCONSTANTS): $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_FILES) $$(rts_H_FILES) -$(includes_GHCCONSTANTS_HASKELL_VALUE): $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_FILES) $$(rts_H_FILES) +$(includes_DERIVEDCONSTANTS): $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_VERSION) $$(includes_H_FILES) $$(rts_H_FILES) +$(includes_GHCCONSTANTS_HASKELL_VALUE): $$(includes_H_CONFIG) $$(includes_H_PLATFORM) $$(includes_H_VERSION) $$(includes_H_FILES) $$(rts_H_FILES) $(includes_DERIVEDCONSTANTS): $(deriveConstants_INPLACE) | $$(dir $$@)/. $< --gen-header -o $@ --tmpdir $(dir $@) $(DERIVE_CONSTANTS_FLAGS) @@ -183,10 +212,10 @@ endif # Install all header files $(eval $(call clean-target,includes,,\ - $(includes_H_CONFIG) $(includes_H_PLATFORM))) + $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_VERSION))) $(eval $(call all-target,includes,\ - $(includes_H_CONFIG) $(includes_H_PLATFORM) \ + $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_VERSION) \ $(includes_GHCCONSTANTS_HASKELL_TYPE) \ $(includes_GHCCONSTANTS_HASKELL_VALUE) \ $(includes_GHCCONSTANTS_HASKELL_WRAPPERS) \ @@ -202,5 +231,5 @@ install_includes : $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)/$d") && \ $(call INSTALL_HEADER,$(INSTALL_OPTS),includes/$d/*.h,"$(DESTDIR)$(ghcheaderdir)/$d/") && \ ) true - $(call INSTALL_HEADER,$(INSTALL_OPTS),$(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_DERIVEDCONSTANTS),"$(DESTDIR)$(ghcheaderdir)/") + $(call INSTALL_HEADER,$(INSTALL_OPTS),$(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_VERSION) $(includes_DERIVEDCONSTANTS),"$(DESTDIR)$(ghcheaderdir)/") diff --git a/mk/project.mk.in b/mk/project.mk.in index 69ed88575e..129b540c88 100644 --- a/mk/project.mk.in +++ b/mk/project.mk.in @@ -29,6 +29,8 @@ ProjectTags = ProjectVersion = @ProjectVersion@$(ProjectTags) ProjectVersionInt = @ProjectVersionInt@ ProjectPatchLevel = @ProjectPatchLevel@ +ProjectPatchLevel1 = @ProjectPatchLevel1@ +ProjectPatchLevel2 = @ProjectPatchLevel2@ ################################################################################ # |