[Git][ghc/ghc][wip/backports-9.4] 7 commits: Bump haddock submodule

Ben Gamari (@bgamari) gitlab at gitlab.haskell.org
Sat Aug 20 16:07:14 UTC 2022



Ben Gamari pushed to branch wip/backports-9.4 at Glasgow Haskell Compiler / GHC


Commits:
42aff86e by Ben Gamari at 2022-08-20T12:07:08-04:00
Bump haddock submodule

Bumps haddock-api version to 2.27.1

- - - - -
6466747b by Ben Gamari at 2022-08-20T12:07:08-04:00
Add release notes for 9.4.2

- - - - -
8e6b979c by Ben Gamari at 2022-08-20T12:07:08-04:00
hadrian: Place manpage in docroot

This relocates it from docs/ to doc/

(cherry picked from commit 37c61cc05f82f4cdc43aece152df8630b7c0419d)

- - - - -
ed1f88eb by Ben Gamari at 2022-08-20T12:07:08-04:00
users-guide: Add :ghc-flag: reference

(cherry picked from commit 14853adf9571c9fe57d70456a4e8470299a81b8e)

- - - - -
ba137e8b by Ben Gamari at 2022-08-20T12:07:08-04:00
users-guide: Fix reference to dead llvm-version substitution

Fixes #22052.

(cherry picked from commit f0dc6f3e2333cc4625bdfb75990f80ef0ef96638)

- - - - -
0ce2dc79 by Ben Gamari at 2022-08-20T12:07:08-04:00
users-guide: Rephrase the rewrite rule documentation

Previously the wording was a tad unclear. Fix this.

Closes #21114.

(cherry picked from commit c57075ebbed5dc8ae82902999b9f5ae5f3e83b0e)

- - - - -
b67d4ac6 by Ben Gamari at 2022-08-20T12:07:08-04:00
Release 9.4.2

- - - - -


7 changed files:

- configure.ac
- + docs/users_guide/9.4.2-notes.rst
- docs/users_guide/exts/rewrite_rules.rst
- docs/users_guide/phases.rst
- docs/users_guide/release-notes.rst
- hadrian/src/Rules/Documentation.hs
- utils/haddock


Changes:

=====================================
configure.ac
=====================================
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.4.1], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.4.2], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
     # Version on master must be X.Y (not X.Y.Z) for ProjectVersionMunged variable
     # to be useful (cf #19058). However, the version must have three components
     # (X.Y.Z) on stable branches (e.g. ghc-9.2) to ensure that pre-releases are
@@ -22,7 +22,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [9.4.1], [glasgow-has
 AC_CONFIG_MACRO_DIRS([m4])
 
 # Set this to YES for a released version, otherwise NO
-: ${RELEASE=NO}
+: ${RELEASE=YES}
 
 # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
 # above.  If this is not a released version, then we will append the


=====================================
docs/users_guide/9.4.2-notes.rst
=====================================
@@ -0,0 +1,88 @@
+.. _release-9-4-2:
+
+Version 9.4.2
+==============
+
+The significant changes to the various parts of the compiler are listed in the
+following sections.
+
+The :ghc-flag:`LLVM backend <-fllvm>` of this release is to be used with LLVM
+10, 11, 12, or 13.
+
+Significant Changes
+~~~~~~~~~~~~~~~~~~~~
+
+This is primarily a bug-fix release addressing packaging issues found in 9.4.1.
+These issues include:
+
+ * Building with the ``make`` build system should now work reliably with
+   GHC 9.0 (:ghc-ticket:`21897`, :ghc-ticket:`22047`)
+ * Make-built binary distributions should no longer complain about incorrect
+   GHC versions during installation (:ghc-ticket:)
+ * Generated Haddock package index pages uploaded to Hackage lacked quick-jump
+   support (:ghc-ticket:`21984`)
+ * Cross-package identifier referenced are now linked correctly in Haddock
+   documentation (:ghc-ticket:`20001`)
+ * Hadrian-built binary distributions no longer attempt to install documentation
+   if documentation was not built (:ghc-ticket:`21976`)
+ * Package registration files installed by Hadrian-built binary distributions now
+   have the correct permissions
+
+In addition, a few non-packaging issues have been resolved:
+
+ * the :ghc-flag:`-no-link` flag no longer attempts to link (:ghc-ticket:`21866`)
+ * a soundness issue in GHCi has been resolved (:ghc-ticket:`22042`,
+   :ghc-ticket:`21083`)
+ * a subtle race condition in the IO manager triggered by changing the
+   capability count was fixed (:ghc-ticket:`21651`)
+ * GHC no longer attempts to use the platform-reserved `x18` register on
+   AArch64/Darwin (:ghc-ticket:`21964`)
+ * GHC's internal linker is now able to resolve symbols provided by FreeBSD's
+   built-in ``iconv`` implementation (:ghc-ticket:`20354`)
+ * GHC is now able to correctly locate ``libc++`` on FreeBSD systems
+
+Included libraries
+------------------
+
+The package database provided with this distribution also contains a number of
+packages other than GHC itself. See the changelogs provided with these packages
+for further change information.
+
+.. ghc-package-list::
+
+    libraries/array/array.cabal:             Dependency of ``ghc`` library
+    libraries/base/base.cabal:               Core library
+    libraries/binary/binary.cabal:           Dependency of ``ghc`` library
+    libraries/bytestring/bytestring.cabal:   Dependency of ``ghc`` library
+    libraries/Cabal/Cabal/Cabal.cabal:       Dependency of ``ghc-pkg`` utility
+    libraries/Cabal/Cabal-syntax/Cabal-syntax.cabal:  Dependency of ``ghc-pkg`` utility
+    libraries/containers/containers/containers.cabal: Dependency of ``ghc`` library
+    libraries/deepseq/deepseq.cabal:         Dependency of ``ghc`` library
+    libraries/directory/directory.cabal:     Dependency of ``ghc`` library
+    libraries/exceptions/exceptions.cabal:   Dependency of ``ghc`` and ``haskeline`` library
+    libraries/filepath/filepath.cabal:       Dependency of ``ghc`` library
+    compiler/ghc.cabal:                      The compiler itself
+    libraries/ghci/ghci.cabal:               The REPL interface
+    libraries/ghc-boot/ghc-boot.cabal:       Internal compiler library
+    libraries/ghc-boot-th/ghc-boot-th.cabal: Internal compiler library
+    libraries/ghc-compact/ghc-compact.cabal: Core library
+    libraries/ghc-heap/ghc-heap.cabal:       GHC heap-walking library
+    libraries/ghc-prim/ghc-prim.cabal:       Core library
+    libraries/haskeline/haskeline.cabal:     Dependency of ``ghci`` executable
+    libraries/hpc/hpc.cabal:                 Dependency of ``hpc`` executable
+    libraries/integer-gmp/integer-gmp.cabal: Core library
+    libraries/libiserv/libiserv.cabal:       Internal compiler library
+    libraries/mtl/mtl.cabal:                 Dependency of ``Cabal`` library
+    libraries/parsec/parsec.cabal:           Dependency of ``Cabal`` library
+    libraries/pretty/pretty.cabal:           Dependency of ``ghc`` library
+    libraries/process/process.cabal:         Dependency of ``ghc`` library
+    libraries/stm/stm.cabal:                 Dependency of ``haskeline`` library
+    libraries/template-haskell/template-haskell.cabal: Core library
+    libraries/terminfo/terminfo.cabal:       Dependency of ``haskeline`` library
+    libraries/text/text.cabal:               Dependency of ``Cabal`` library
+    libraries/time/time.cabal:               Dependency of ``ghc`` library
+    libraries/transformers/transformers.cabal: Dependency of ``ghc`` library
+    libraries/unix/unix.cabal:               Dependency of ``ghc`` library
+    libraries/Win32/Win32.cabal:             Dependency of ``ghc`` library
+    libraries/xhtml/xhtml.cabal:             Dependency of ``haddock`` executable
+


=====================================
docs/users_guide/exts/rewrite_rules.rst
=====================================
@@ -438,8 +438,8 @@ earlier versions of GHC. For example, suppose that: ::
 where ``intLookup`` is an implementation of ``genericLookup`` that works
 very fast for keys of type ``Int``. You might wish to tell GHC to use
 ``intLookup`` instead of ``genericLookup`` whenever the latter was
-called with type ``Table Int b -> Int -> b``. It used to be possible to
-write ::
+called with type ``Table Int b -> Int -> b``. It used to be possible to write a
+:pragma:`SPECIALIZE` pragma with a right-hand-side: ::
 
     {-# SPECIALIZE genericLookup :: Table Int b -> Int -> b = intLookup #-}
 


=====================================
docs/users_guide/phases.rst
=====================================
@@ -474,7 +474,7 @@ defined by your local GHC installation, the following trick is useful:
     .. index::
        single: __GLASGOW_HASKELL_LLVM__
 
-    Only defined when ``-fllvm`` is specified. When GHC is using version
+    Only defined when `:ghc-flag:`-fllvm` is specified. When GHC is using version
     ``x.y.z`` of LLVM, the value of ``__GLASGOW_HASKELL_LLVM__`` is the
     integer ⟨xyy⟩ (if ⟨y⟩ is a single digit, then a leading zero
     is added, so for example when using version 3.7 of LLVM,
@@ -621,8 +621,8 @@ Options affecting code generation
 
     .. note::
 
-        Note that this GHC release expects an LLVM version in the |llvm-version|
-        release series.
+        Note that this GHC release expects an LLVM version between |llvm-version-min|
+        and |llvm-version-max|.
 
 .. ghc-flag:: -fno-code
     :shortdesc: Omit code generation


=====================================
docs/users_guide/release-notes.rst
=====================================
@@ -4,4 +4,5 @@ Release notes
 .. toctree::
    :maxdepth: 1
 
+   9.4.2-notes
    9.4.1-notes


=====================================
hadrian/src/Rules/Documentation.hs
=====================================
@@ -41,7 +41,7 @@ archiveRoot :: FilePath
 archiveRoot = docRoot -/- "archives"
 
 manPageBuildPath :: FilePath
-manPageBuildPath = "docs/users_guide/build-man/ghc.1"
+manPageBuildPath = docRoot -/- "users_guide/build-man/ghc.1"
 
 -- TODO: Get rid of this hack.
 docContext :: Context


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 421e4c36e58cae686d55a99946d5fa54abaa6000
+Subproject commit 6113875efdc0b6be66deedb77e28d3b9e4253d1e



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/80b46a1a3597be3c8f54ed6c61c26d466ae88dd0...b67d4ac67af7cca18a4b3c93e572478763f2e5fb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/80b46a1a3597be3c8f54ed6c61c26d466ae88dd0...b67d4ac67af7cca18a4b3c93e572478763f2e5fb
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20220820/02d6d196/attachment-0001.html>


More information about the ghc-commits mailing list