[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 8 commits: configure: Bump version to 9.6

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
ceb2e9b9 by Ben Gamari at 2022-12-21T15:26:08-05:00
configure: Bump version to 9.6

- - - - -
fb4d36c4 by Ben Gamari at 2022-12-21T15:27:49-05:00
base: Bump version to 4.18

Requires various submodule bumps.

- - - - -
93ee7e90 by Ben Gamari at 2022-12-21T15:27:49-05:00
ghc-boot: Fix bootstrapping

- - - - -
d251045b by Andreas Klebinger at 2022-12-22T05:54:14-05:00
Don't consider large byte arrays/compact regions pinned.

Workaround for #22255 which showed how treating large/compact regions
as pinned could cause segfaults.

- - - - -
5b7206a9 by Matthew Pickering at 2022-12-22T05:54:16-05:00
hadrian bindist: Install manpages to share/man/man1/ghc.1

When the installation makefile was copied over the manpages were no
longer installed in the correct place. Now we install it into share/man/man1/ghc.1
as the make build system did.

Fixes #22371

- - - - -
78dc75df by Ben Gamari at 2022-12-22T05:54:16-05:00
rts: Drop paths from configure from cabal file

A long time ago we would rely on substitutions from the configure script
to inject paths of the include and library directories of libffi and
libdw. However, now these are instead handled inside Hadrian when
calling Cabal's `configure` (see the uses of `cabalExtraDirs` in
Hadrian's `Settings.Packages.packageArgs`).

While the occurrences in the cabal file were redundant, they did no
harm. However, since b5c714545abc5f75a1ffdcc39b4bfdc7cd5e64b4 they have
no longer been interpolated. @mpickering noticed the suspicious
uninterpolated occurrence of `@FFIIncludeDir@` in #22595,
prompting this commit to finally remove them.

- - - - -
b45a669d by Simon Peyton Jones at 2022-12-22T05:54:17-05:00
Fix unifier bug: failing to decompose over-saturated type family

This simple patch fixes #22647

- - - - -
a34c06f0 by Ben Gamari at 2022-12-22T05:54:17-05:00
rts/m32: Fix sanity checking

Previously we would attempt to clear pages which were marked as
read-only. Fix this.

- - - - -


30 changed files:

- compiler/GHC/Core/Unify.hs
- compiler/ghc.cabal.in
- configure.ac
- hadrian/bindist/Makefile
- libraries/array
- libraries/base/base.cabal
- libraries/deepseq
- libraries/directory
- libraries/filepath
- libraries/ghc-boot-th/ghc-boot-th.cabal.in
- libraries/ghc-boot/GHC/Utils/Encoding/UTF8.hs
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-compact/ghc-compact.cabal
- libraries/ghc-prim/changelog.md
- libraries/ghci/ghci.cabal.in
- libraries/parsec
- libraries/process
- libraries/stm
- libraries/template-haskell/template-haskell.cabal.in
- libraries/terminfo
- libraries/unix
- rts/PrimOps.cmm
- rts/linker/M32Alloc.c
- rts/rts.cabal.in
- testsuite/tests/backpack/cabal/bkpcabal02/bkpcabal02.stdout
- testsuite/tests/cabal/t18567/T18567.stderr
- testsuite/tests/rts/T13894.hs
- testsuite/tests/rts/T14900.hs
- testsuite/tests/rts/T14900.stdout
- + testsuite/tests/typecheck/should_compile/T22647.hs


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ce6ae36dc1c02c8851b354bbd576d97d78bc9d9c...a34c06f0528897d7628a951876f20010b168e0d7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ce6ae36dc1c02c8851b354bbd576d97d78bc9d9c...a34c06f0528897d7628a951876f20010b168e0d7
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/20221222/56bd2307/attachment.html>