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

Tue May 23 10:29:32 UTC 2023

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

Commits:
1b327cee by Rodrigo Mesquita at 2023-05-23T11:21:33+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

- - - - -
ba15bc0a by Ben Gamari at 2023-05-23T11:28:57+01:00
ghc-toolchain: Initial commit

- - - - -
84a51145 by Ben Gamari at 2023-05-23T11:28:57+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

- - - - -
0651874e by Ben Gamari at 2023-05-23T11:28:57+01:00
Move via-C flags into GHC

- - - - -
c3c2d7f6 by Ben Gamari at 2023-05-23T11:28:57+01:00
Rip out runtime linker/compiler checks

- - - - -
b622aedb by Ben Gamari at 2023-05-23T11:28:57+01:00
configure: Rip out toolchain selection logic

- - - - -
50a68b98 by Ben Gamari at 2023-05-23T11:28:57+01:00
Fixes

- - - - -
42322e5f by Rodrigo Mesquita at 2023-05-23T11:28:57+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.

- - - - -
f134aa72 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Re-introduce ld-override option

- - - - -
6da145d1 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ROMES:WIP

- - - - -
205bdeb2 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ghc-toolchain library and usage in hadrian flags

- - - - -
985c3b85 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ROMES: WIP

- - - - -
9df2544e by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Re-introduce flags in hadrian config

- - - - -
6cef8a16 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ROMES WIP

- - - - -
37874c85 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ghc-toolchain: UseLibFFI, LdCompactUnwind, LdFileList

A more complete ghc-toolchain.
Added configuration of:

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

- - - - -
56555815 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Handle passing CPP cmd and flags from configure to ghc-toolchain

- - - - -
fd7b41df by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Rip more of configure that is no longer being used

- - - - -
dba2aadc by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Remove configure checks of GNUnoexecStack and ident directive

And fix bug in ghc-toolchain respective code

- - - - -
984b1bce by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Rip out more from hadrians system.config.in

- - - - -
c29c198e by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Configure CLink supports response files

- - - - -
bec1b014 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Read deleted keys from host and target's target

- - - - -
f705de7f by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ROMES: WIP 3

- - - - -
d5dcd6a1 by Rodrigo Mesquita at 2023-05-23T11:28:57+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.

- - - - -
567a9c49 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Fix [host|target]-[os|arch] vs [host|target]-haskell-[os|arch]

- - - - -
e06326d1 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Handle unspecified vs specified flags and commands better

- - - - -
0f078251 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ROMES: WIP 4

- - - - -
dae1640f by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Configure Cpp and HsCpp separately

- - - - -
337dd695 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Fixes for compilation

- - - - -
fd5372c6 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Link is GNU linkerg

- - - - -
cc10dc18 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
ROMES: WIP 5

- - - - -
20b2af0b by Rodrigo Mesquita at 2023-05-23T11:28:57+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.

- - - - -
9664da97 by Rodrigo Mesquita at 2023-05-23T11:28:57+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...

- - - - -
71802cd3 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
helper AC function for enable/disable

- - - - -
3e067f48 by Rodrigo Mesquita at 2023-05-23T11:28:57+01:00
Delete unused imports of SysTools.Info

- - - - -
3a81dbd9 by Rodrigo Mesquita at 2023-05-23T11:28:57+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/8196df064f0427fbbfb23e5bbeb1214c3a493613...3a81dbd9113a21d65b0b2a837effbc5b8a0fb476

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/8196df064f0427fbbfb23e5bbeb1214c3a493613...3a81dbd9113a21d65b0b2a837effbc5b8a0fb476
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/f3d44756/attachment-0001.html>