[Git][ghc/ghc][wip/toolchain-selection] 19 commits: configure: Drop DllWrap command

Wed Jul 12 08:22:39 UTC 2023

Rodrigo Mesquita pushed to branch wip/toolchain-selection at Glasgow Haskell Compiler / GHC

Commits:
1d452ce8 by Rodrigo Mesquita at 2023-07-12T09:18:20+01:00
configure: Drop DllWrap command

We used to configure into settings a DllWrap command for windows
builds and distributions, however, we no longer do, and dllwrap is
effectively unused.

This simplification is motivated in part by the larger
toolchain-selection project (#19877, !9263)

- - - - -
347036af by Ben Gamari at 2023-07-12T09:18:52+01:00
ghc-toolchain: Initial commit

- - - - -
af72240f by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
Create ghc_toolchain.m4

Don't pass options to ghc-toolchain, it should arrive at the same conclusion as configure for now

Don't crash on ghc-toolchain failure

Mingw bundled toolchain

- - - - -
7bd1663c by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
ghc-toolchain: Toolchain Selection

ghc-toolchain: Rename readProcess to readProcessStdout

Fixes bugs regarding a translation from the original autconf program
that failed to account for the exit code.

The longer name reenforces that we really only care about the stdout,
and the exit code and stderr of the program are irrelevant for the case.

Fixes

Re-introduce ld-override option

ghc-toolchain library and usage in hadrian flags

Re-introduce flags in hadrian config

ghc-toolchain: UseLibFFI, LdCompactUnwind, LdFileList

A more complete ghc-toolchain.
Added configuration of:

* Use libffi for adjustors
* Supports compact unwind
* Supports filelist

Handle passing CPP cmd and flags from configure to ghc-toolchain

Rip more of configure that is no longer being used

Remove configure checks of GNUnoexecStack and ident directive

And fix bug in ghc-toolchain respective code

Rip out more from hadrians system.config.in

Configure CLink supports response files

Read deleted keys from host and target's target

Delete CMD_OPTS_STAGEX

Instead of having configure configure different options for different
programs depend on the stage, we delete this completely and have hadrian
select the correct target toolchain configuration file depending on the
stage, from which it can read those options.

Fix [host|target]-[os|arch] vs [host|target]-haskell-[os|arch]

Handle unspecified vs specified flags and commands better

Configure Cpp and HsCpp separately

Fixes for compilation

Link is GNU linkerg

Revert "Rip more of configure that is no longer being used"

I realized we still need this function in rts/configure.ac

This reverts commit 01f5d4b4.

Revert get_arm_isa deletion from 74f03f24

As in the previous commit, we still need this info from the rts
configure script.

I suppose it could be useful for the rts to also read somehow the
toolchain information...

helper AC function for enable/disable

Delete unused imports of SysTools.Info

Drop PROG_CPP in distrib/autoconf too

Get rid of MonadCatch instances and dependencies

ghc-toolchain: Check Cc supports extra-via-c-flags

Consider empty programs as non-specified programs

Cpp and HsCpp cleanup

Add comment from check for gold t22266

Remove more settings bits from hadrian/cfg

Use llvm target from ghc-toolchain

Print default.target

Fix bugs in MergeTool and Ar

Add check and log errors on error

X

Revert LLVMTarget deletion in mkprojectmkin

Fix stack job

Fixes for ghc-toolchain to match configure output

ghc-toolchain: Fix ar supports at file

Fixes

ghc-toolchain: Fix check for gold bug

ghc-toolchain: configure linker options correctly

Support more targets and dont use llvmtarget

allow duplos in place of triples

A TODO comment

ghc-toolchain: set CC LD plat. dependent flags

A lot to be said about the approach of configuring linker flags (what
used to be SET CC LD platform dependent flags in configure), we might
want to re-do this all eventually...
Perhaps I ought to add a TODO at the top level of these functions?

We might also not do it altogether, some of these might be outdated?

Move osElfTarget from GHC.Platform to GHC.Platform.ArchOS, to use it in
Toolchain.Tools.Link to correctly determine if -Wl,--no-as-needed is required

Windows bundled toolchain, output path, etc

Add windows bundled toolchain specific flags

- - - - -
878f5e78 by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
refactor on hadrian handling of toolchains

Fixes to hadrian and ghc-toolchain

- - - - -
dd5444fe by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
configure: Create and validate toolchain target file

Interpolate LeadingUnderscore in distrib/configure.ac.in

- - - - -
342d09cd by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
Split GHC.Platform.ArchOS from ghc-boot into ghc-platform

- - - - -
9bad0e62 by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
Use ghc-platform instead of ghc-boot

- - - - -
ed6740f8 by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
Revert "Mingw bundled toolchain"

This reverts commit 7d04d6bcb4a65d6dc97f1d59497c3c0a208b8be6.

Revert "Windows bundled toolchain, output path, etc"

This reverts commit 50089ea4b39885c38f1e6b02c9babebf47170d1c.

Revert "Add windows bundled toolchain specific flags"

This reverts commit a5734d7450890f739196d46610ba8d5558755782.

Adjust

- - - - -
e349bf98 by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
FixeWs

Fixes2

- - - - -
c12fa335 by Rodrigo Mesquita at 2023-07-12T09:18:52+01:00
Try to add locally-executable arg

- - - - -
5dfb5d41 by Rodrigo Mesquita at 2023-07-12T09:22:26+01:00
New host.target

- - - - -
67432ee9 by Rodrigo Mesquita at 2023-07-12T09:22:26+01:00
Try to parse the undefined fields

- - - - -
1968bdab by Rodrigo Mesquita at 2023-07-12T09:22:26+01:00
Configure Host toolchain with dummy options, hope they aren't used

- - - - -
47fffb7f by Rodrigo Mesquita at 2023-07-12T09:22:26+01:00
prettier comment

- - - - -
5083190e by Rodrigo Mesquita at 2023-07-12T09:22:26+01:00
Fixes

- - - - -
f4769f92 by Rodrigo Mesquita at 2023-07-12T09:22:27+01:00
Windows builtin toolchain

- - - - -
4e8f54c2 by Rodrigo Mesquita at 2023-07-12T09:22:27+01:00
dont validate ghc-toolchain host

- - - - -
60ad3491 by Rodrigo Mesquita at 2023-07-12T09:22:27+01:00
Add flag to enable/disable ghc-toolchain based configurations

This flag is disabled by default, and we'll use the
configure-generated-toolchains by default until we remove the toolchain
configuration logic from configure.

- - - - -

30 changed files:

- + TODO
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Linker/Static.hs
- compiler/GHC/Platform.hs
- compiler/GHC/Settings.hs
- compiler/GHC/Settings/IO.hs
- configure.ac
- + default.host.target.in
- + default.target.in
- distrib/configure.ac.in
- hadrian/bindist/Makefile
- hadrian/bindist/config.mk.in
- hadrian/cabal.project
- hadrian/cfg/system.config.in
- hadrian/hadrian.cabal
- hadrian/src/Base.hs
- hadrian/src/Builder.hs
- hadrian/src/Context.hs
- hadrian/src/Flavour.hs
- hadrian/src/Hadrian/Haskell/Hash.hs
- hadrian/src/Hadrian/Oracles/TextFile.hs
- hadrian/src/Oracles/Flag.hs
- hadrian/src/Oracles/Setting.hs
- hadrian/src/Packages.hs
- hadrian/src/Rules/BinaryDist.hs
- hadrian/src/Rules/Generate.hs
- hadrian/src/Rules/Gmp.hs
- hadrian/src/Rules/Libffi.hs
- hadrian/src/Rules/Lint.hs
- hadrian/src/Rules/Test.hs

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/48f6dd226dab48e282c96bb896a3d1f72c9a6cad...60ad3491fc60599afbbb2224145a5adc73c2eddd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/48f6dd226dab48e282c96bb896a3d1f72c9a6cad...60ad3491fc60599afbbb2224145a5adc73c2eddd
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/20230712/3420a25f/attachment-0001.html>