https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61534
--- Comment #3 from Marek Polacek <mpolacek at gcc dot gnu.org> --- I don't think so, -ftrack-macro-expansion=2 is on by default and I don't see -ftrack-macro-expansion=0 anywhere in the log of bootstrap. So maybe my approach would be viable after all (and I could fix PR61081 the same way then).