https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114105
--- Comment #3 from Sam James <sjames at gcc dot gnu.org> --- I have a patch which includes those extra hunks (in addition to the PR111632 one), but didn't have a chance yet to look at iain's build failure on darwin.