[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 7 commits: haddock: Re-organise cross-OS compatibility layer

Marge Bot (@marge-bot) gitlab at gitlab.haskell.org
Tue Sep 10 23:51:37 UTC 2024



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


Commits:
949ebced by Hécate Kleidukos at 2024-09-10T19:19:40-04:00
haddock: Re-organise cross-OS compatibility layer

- - - - -
84ac9a99 by Hécate Kleidukos at 2024-09-10T19:19:40-04:00
haddock: Remove CPP for obsolete GHC and Cabal versions

- - - - -
370d1599 by Hécate Kleidukos at 2024-09-10T19:19:40-04:00
haddock: Move the changelog file to the 'extra-doc-files' section in the cabal file

- - - - -
cfbff65a by Simon Peyton Jones at 2024-09-10T19:20:16-04:00
Add ZonkAny and document it

This MR fixed #24817 by adding ZonkAny, which takes a Nat
argument.

See Note [Any types] in GHC.Builtin.Types, especially
wrinkle (Any4).

- - - - -
b5f3ee90 by Matthew Pickering at 2024-09-10T19:51:31-04:00
hadrian: Make sure ffi headers are built before using a compiler

When we are using ffi adjustors then we rely on `ffi.h` and
`ffitarget.h` files during code generation when compiling stubs.

Therefore we need to add this dependency to the build system (which this
patch does).

Reproducer, configure with `--enable-libffi-adjustors` and then build
"_build/stage1/libraries/ghc-prim/build/GHC/Types.p_o".

Observe that this fails before this patch and works afterwards.

Fixes #24864

Co-authored-by: Sylvain Henry <sylvain at haskus.fr>

- - - - -
431b28e5 by Rodrigo Mesquita at 2024-09-10T19:51:32-04:00
base: Deprecate BCO primops exports from GHC.Exts

See https://github.com/haskell/core-libraries-committee/issues/212.

These reexports will be removed in GHC 9.14.

- - - - -
d57344fc by Alan Zimmerman at 2024-09-10T19:51:32-04:00
EPA: Remove Anchor = EpaLocation synonym

This just causes confusion.

- - - - -


30 changed files:

- compiler/GHC/Builtin/Names.hs
- compiler/GHC/Builtin/Types.hs
- compiler/GHC/Parser.y
- compiler/GHC/Parser/Annotation.hs
- compiler/GHC/Parser/PostProcess.hs
- compiler/GHC/Tc/Types.hs
- compiler/GHC/Tc/Utils/Monad.hs
- compiler/GHC/Tc/Zonk/Type.hs
- hadrian/src/Builder.hs
- libraries/base/src/GHC/Exts.hs
- libraries/ghci/GHCi/CreateBCO.hs
- libraries/ghci/ghci.cabal.in
- + testsuite/tests/module/T21752.stderr
- testsuite/tests/perf/compiler/T11068.stdout
- testsuite/tests/pmcheck/should_compile/T12957.stderr
- + testsuite/tests/pmcheck/should_compile/T24817.hs
- testsuite/tests/pmcheck/should_compile/all.T
- testsuite/tests/printer/T17697.stderr
- testsuite/tests/profiling/should_run/staticcallstack002.stdout
- testsuite/tests/simplCore/should_compile/T13156.stdout
- testsuite/tests/typecheck/should_fail/T13292.stderr
- utils/check-exact/ExactPrint.hs
- utils/check-exact/Utils.hs
- + utils/haddock/haddock-api/compat/posix/Haddock/Compat.hs
- + utils/haddock/haddock-api/compat/windows/Haddock/Compat.hs
- utils/haddock/haddock-api/haddock-api.cabal
- utils/haddock/haddock-api/src/Haddock.hs
- utils/haddock/haddock-api/src/Haddock/Interface.hs
- utils/haddock/haddock-api/src/Haddock/Types.hs
- utils/haddock/haddock-api/src/Haddock/Utils.hs


The diff was not included because it is too large.


View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1c0fe5eb122f82e121e71fa5fbd4f6060b5646dc...d57344fc13bdbb23d73636a0a4635b060743d77c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/1c0fe5eb122f82e121e71fa5fbd4f6060b5646dc...d57344fc13bdbb23d73636a0a4635b060743d77c
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/20240910/ac3bca78/attachment.html>


More information about the ghc-commits mailing list