[Git][ghc/ghc][wip/toolchain-selection] 35 commits: Configure CPP into settings

Tue May 23 13:18:23 UTC 2023

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

Commits:
ecf26113 by Rodrigo Mesquita at 2023-05-23T14:17:31+01:00
Configure CPP into settings

There is a distinction to be made between the Haskell Preprocessor and
the C preprocessor. The former is used to preprocess haskell files,
while the latter is used in C preprocessing such as Cmm files.

In practice, they are both the same program (usually the C compiler) but
invoked with different flags.

Previously we would, at configure time, configure the haskell
preprocessor and save the configuration in the settings file, but,
instead of doing the same for CPP, we had hardcoded in GHC that the CPP
program was either `cc -E` or `cpp`.

This commit fixes that asymmetry by also configuring CPP at configure
time, and tries to make more explicit the difference between HsCpp and
Cpp (see Note [Preprocessing invocations]).

Note that we don't use the standard CPP and CPPFLAGS to configure Cpp,
but instead use the non-standard --with-cpp and --with-cpp-flags.
The reason is that autoconf sets CPP to "$CC -E", whereas we expect the
CPP command to be configured as a standalone executable rather than a
command. These are symmetrical with --with-hs-cpp and
--with-hs-cpp-flags.

Cleanup: Hadrian no longer needs to pass the CPP configuration for CPP
         to be C99 compatible through -optP, since we now configure that
         into settings.

Closes #23422

- - - - -
49fc40ba by Ben Gamari at 2023-05-23T14:18:01+01:00
ghc-toolchain: Initial commit

- - - - -
d009e6db by Ben Gamari at 2023-05-23T14:18:01+01:00
configure: Rip out Solaris dyld check

Solaris 11 was released over a decade ago and, moreover, I doubt we have
any Solaris users

- - - - -
0707edf2 by Ben Gamari at 2023-05-23T14:18:01+01:00
Move via-C flags into GHC

- - - - -
6e82ecc8 by Ben Gamari at 2023-05-23T14:18:01+01:00
Rip out runtime linker/compiler checks

- - - - -
6b2ee26f by Ben Gamari at 2023-05-23T14:18:01+01:00
configure: Rip out toolchain selection logic

- - - - -
5ba6f79f by Ben Gamari at 2023-05-23T14:18:01+01:00
Fixes

- - - - -
36314304 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
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.

- - - - -
ca53a862 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Re-introduce ld-override option

- - - - -
1cdc2df3 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
ROMES:WIP

- - - - -
625b3541 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
ghc-toolchain library and usage in hadrian flags

- - - - -
7fb4387d by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
ROMES: WIP

- - - - -
a84fe1e0 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Re-introduce flags in hadrian config

- - - - -
cffbd322 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
ROMES WIP

- - - - -
8a86f218 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
ghc-toolchain: UseLibFFI, LdCompactUnwind, LdFileList

A more complete ghc-toolchain.
Added configuration of:

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

- - - - -
49bd3fc3 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Handle passing CPP cmd and flags from configure to ghc-toolchain

- - - - -
afbd6e3a by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Rip more of configure that is no longer being used

- - - - -
9a62f644 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Remove configure checks of GNUnoexecStack and ident directive

And fix bug in ghc-toolchain respective code

- - - - -
108069be by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Rip out more from hadrians system.config.in

- - - - -
09c8920d by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Configure CLink supports response files

- - - - -
50d23648 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Read deleted keys from host and target's target

- - - - -
8891d403 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
ROMES: WIP 3

- - - - -
5ce26f08 by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
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.

- - - - -
4104868a by Rodrigo Mesquita at 2023-05-23T14:18:01+01:00
Fix [host|target]-[os|arch] vs [host|target]-haskell-[os|arch]

- - - - -
3d9f2bc8 by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
Handle unspecified vs specified flags and commands better

- - - - -
5157dd78 by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
ROMES: WIP 4

- - - - -
6dbce8ad by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
Configure Cpp and HsCpp separately

- - - - -
6a70f1dd by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
Fixes for compilation

- - - - -
5dc15cc9 by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
Link is GNU linkerg

- - - - -
a6c7dcfd by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
ROMES: WIP 5

- - - - -
58ef1ebe by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
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 01f5d4b480f4ab1514ac0a4fc957db199d1a0279.

- - - - -
b411b5e7 by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
Revert get_arm_isa deletion from 74f03f243d08aa910d39cdd9dadb976e9386283a

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...

- - - - -
9bbc3c25 by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
helper AC function for enable/disable

- - - - -
4c6c0d4c by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
Delete unused imports of SysTools.Info

- - - - -
87e47f34 by Rodrigo Mesquita at 2023-05-23T14:18:02+01:00
Drop PROG_CPP in distrib/autoconf too

- - - - -

30 changed files:

- compiler/GHC/Driver/Backend.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Main.hs
- compiler/GHC/Driver/Pipeline/Execute.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Linker/ExtraObj.hs
- compiler/GHC/Linker/Static.hs
- compiler/GHC/Settings.hs
- compiler/GHC/Settings/IO.hs
- compiler/GHC/StgToJS/Linker/Linker.hs
- compiler/GHC/SysTools.hs
- compiler/GHC/SysTools/Cpp.hs
- compiler/GHC/SysTools/Info.hs
- compiler/GHC/SysTools/Tasks.hs
- configure.ac
- distrib/configure.ac.in
- hadrian/bindist/Makefile
- 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/Hadrian/Haskell/Hash.hs
- hadrian/src/Hadrian/Oracles/TextFile.hs
- hadrian/src/Oracles/Flag.hs
- hadrian/src/Oracles/Setting.hs
- hadrian/src/Rules/BinaryDist.hs
- hadrian/src/Rules/Generate.hs
- hadrian/src/Rules/Gmp.hs

The diff was not included because it is too large.

View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3a81dbd9113a21d65b0b2a837effbc5b8a0fb476...87e47f34b1a316abaac17cf27b944a08cbd020a8

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/3a81dbd9113a21d65b0b2a837effbc5b8a0fb476...87e47f34b1a316abaac17cf27b944a08cbd020a8
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/20230523/6e28cd7c/attachment-0001.html>