[Bug other/91085] fixincludes breaks <bits/statx.h>

[Bug other/91085] fixincludes breaks <bits/statx.h>

[martingalvan at sourceware dot org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

Tendel10 at protonmail dot com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |Tendel10 at protonmail dot com

martingalvan at sourceware dot org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |martingalvan at sourceware dot org

--- Comment #9 from Tendel10 at protonmail dot com ---
I am having this issue as well, any updates on this bug?

--- Comment #10 from Tendel10 at protonmail dot com ---
I am having this issue as well, any updates on this bug?

--- Comment #11 from martingalvan at sourceware dot org ---
This bug is still happening on gcc 9.2.1.

[Bug other/91085] fixincludes breaks <bits/statx.h>

[bkorb at gnu dot org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

--- Comment #12 from Bruce Korb <bkorb at gnu dot org> ---
I'll put it on my to-do list, but I might be participating in a fire evacuation
tonight or tomorrow and I haven't built GCC in several years now. I'm going to
guess that you have to not do the substitution when the line contains something
like:

    #[ \t]*if[ \t]+__glibc_has

[Bug other/91085] fixincludes breaks <bits/statx.h>

[xry111 at mengyan1223 dot wang]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

Xi Ruoyao <xry111 at mengyan1223 dot wang> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |xry111 at mengyan1223 dot wang

--- Comment #13 from Xi Ruoyao <xry111 at mengyan1223 dot wang> ---
Patch: https://gcc.gnu.org/pipermail/gcc-patches/2021-June/573676.html

[Bug other/91085] fixincludes breaks <bits/statx.h>

[bkorb at gnu dot org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

--- Comment #14 from Bruce Korb <bkorb at gnu dot org> ---
Reworking fixfixes.c seems pretty heavy duty.
I'm downloading the GCC sources now. I'll take a peek tomorrow.

[Bug other/91085] fixincludes breaks <bits/statx.h>

[bkorb at gnu dot org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

--- Comment #15 from Bruce Korb <bkorb at gnu dot org> ---
Obviously, "print_quote()" was needed early on (1999) and then saved for
prosperity :). Your patch is inadequate because it will have to not expand
'linux' in a line such as:

    #if __has_include(<linux/foo.h>)

In other words, it will have to skip over three flavors of quote. Or just two,
if you omit apostrophe quotes. In any event, the '<' character will have to be
matched with '>', which is a tiny change to the logic.

Don't forget to add tests in the final result.

[Bug other/91085] fixincludes breaks <bits/statx.h>

[xry111 at mengyan1223 dot wang]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

--- Comment #16 from Xi Ruoyao <xry111 at mengyan1223 dot wang> ---
(In reply to Bruce Korb from comment #15)
> Obviously, "print_quote()" was needed early on (1999) and then saved for
> prosperity :). Your patch is inadequate because it will have to not expand
> 'linux' in a line such as:
> 
>     #if __has_include(<linux/foo.h>)
> 
> In other words, it will have to skip over three flavors of quote. Or just
> two, if you omit apostrophe quotes. In any event, the '<' character will
> have to be matched with '>', which is a tiny change to the logic.
> 
> Don't forget to add tests in the final result.

Simply skipping <...> can be problematic for something like:

#if A < B && i386 && C > D
#define USE_I386_WORKAROUND
#endif

[Bug other/91085] fixincludes breaks <bits/statx.h>

[xry111 at mengyan1223 dot wang]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

--- Comment #17 from Xi Ruoyao <xry111 at mengyan1223 dot wang> ---
Revised patch, matching __has_include(...):

https://gcc.gnu.org/pipermail/gcc-patches/2021-June/573789.html

[Bug other/91085] fixincludes breaks <bits/statx.h>

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

--- Comment #18 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Xi Ruoyao <xry111@gcc.gnu.org>:

https://gcc.gnu.org/g:6bf383c37e6131a8e247e8a0997d55d65c830b6d

commit r12-1924-g6bf383c37e6131a8e247e8a0997d55d65c830b6d
Author: Xi Ruoyao <xry111@mengyan1223.wang>
Date:   Mon Jun 28 13:54:58 2021 +0800

    fixinc: don't "fix" machine names in __has_include(...) [PR91085]

    fixincludes/

            PR other/91085
            * fixfixes.c (check_has_inc): New static function.
              (machine_name_fix): Don't replace header names in
              __has_include(...).
            * inclhack.def (machine_name): Adjust test.
            * tests/base/testing.h: Update.

[Bug other/91085] [11 only] fixincludes breaks <bits/statx.h>

[rguenth at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|10.5                        |11.5
            Summary|[10/11 only] fixincludes    |[11 only] fixincludes
                   |breaks <bits/statx.h>       |breaks <bits/statx.h>
      Known to fail|                            |10.5.0