* [PATCH] aix: Fixinclude updates [PR98208]
@ 2020-12-11 0:59 Ilya Leoshkevich
2020-12-11 7:41 ` Richard Biener
2020-12-11 12:51 ` Nathan Sidwell
0 siblings, 2 replies; 5+ messages in thread
From: Ilya Leoshkevich @ 2020-12-11 0:59 UTC (permalink / raw)
To: gcc-patches, Nathan Sidwell
Tested on gcc121 (x86_64 CentOS Linux 7). Ok for master?
After 92648faa1cb2 ("aix: Fixinclude") make check-fixincludes began to
fail (at least on gcc121 machine). Fix by updating fixincludes/tests
and rerunning genfixes.
fixincludes/ChangeLog:
2020-12-11 Ilya Leoshkevich <iii@linux.ibm.com>
* fixincl.x: Rerun genfixes.
* tests/base/sys/types.h: Add AIX_PHYSADR_T_CHECK.
---
fixincludes/fixincl.x | 4 ++--
fixincludes/tests/base/sys/types.h | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 21439652bce..cc17edfba0b 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed October 21, 2020 at 10:43:22 AM by AutoGen 5.18.16
+ * It has been AutoGen-ed December 9, 2020 at 11:16:08 AM by AutoGen 5.18.16
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Oct 21 10:43:22 EDT 2020
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Dec 9 11:16:08 EST 2020
*
* You must regenerate it. Use the ./genfixes script.
*
diff --git a/fixincludes/tests/base/sys/types.h b/fixincludes/tests/base/sys/types.h
index 683b5e93ecd..a318f9b713b 100644
--- a/fixincludes/tests/base/sys/types.h
+++ b/fixincludes/tests/base/sys/types.h
@@ -9,6 +9,11 @@
+#if defined( AIX_PHYSADR_T_CHECK )
+typedef struct __physadr_s {
+#endif /* AIX_PHYSADR_T_CHECK */
+
+
#if defined( GNU_TYPES_CHECK )
#if !defined(_GCC_PTRDIFF_T)
#define _GCC_PTRDIFF_T
--
2.25.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] aix: Fixinclude updates [PR98208]
2020-12-11 0:59 [PATCH] aix: Fixinclude updates [PR98208] Ilya Leoshkevich
@ 2020-12-11 7:41 ` Richard Biener
2020-12-11 12:51 ` Nathan Sidwell
1 sibling, 0 replies; 5+ messages in thread
From: Richard Biener @ 2020-12-11 7:41 UTC (permalink / raw)
To: Ilya Leoshkevich; +Cc: GCC Patches, Nathan Sidwell
On Fri, Dec 11, 2020 at 2:01 AM Ilya Leoshkevich via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> Tested on gcc121 (x86_64 CentOS Linux 7). Ok for master?
OK
>
>
> After 92648faa1cb2 ("aix: Fixinclude") make check-fixincludes began to
> fail (at least on gcc121 machine). Fix by updating fixincludes/tests
> and rerunning genfixes.
>
> fixincludes/ChangeLog:
>
> 2020-12-11 Ilya Leoshkevich <iii@linux.ibm.com>
>
> * fixincl.x: Rerun genfixes.
> * tests/base/sys/types.h: Add AIX_PHYSADR_T_CHECK.
> ---
> fixincludes/fixincl.x | 4 ++--
> fixincludes/tests/base/sys/types.h | 5 +++++
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
> index 21439652bce..cc17edfba0b 100644
> --- a/fixincludes/fixincl.x
> +++ b/fixincludes/fixincl.x
> @@ -2,11 +2,11 @@
> *
> * DO NOT EDIT THIS FILE (fixincl.x)
> *
> - * It has been AutoGen-ed October 21, 2020 at 10:43:22 AM by AutoGen 5.18.16
> + * It has been AutoGen-ed December 9, 2020 at 11:16:08 AM by AutoGen 5.18.16
> * From the definitions inclhack.def
> * and the template file fixincl
> */
> -/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Oct 21 10:43:22 EDT 2020
> +/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Dec 9 11:16:08 EST 2020
> *
> * You must regenerate it. Use the ./genfixes script.
> *
> diff --git a/fixincludes/tests/base/sys/types.h b/fixincludes/tests/base/sys/types.h
> index 683b5e93ecd..a318f9b713b 100644
> --- a/fixincludes/tests/base/sys/types.h
> +++ b/fixincludes/tests/base/sys/types.h
> @@ -9,6 +9,11 @@
>
>
>
> +#if defined( AIX_PHYSADR_T_CHECK )
> +typedef struct __physadr_s {
> +#endif /* AIX_PHYSADR_T_CHECK */
> +
> +
> #if defined( GNU_TYPES_CHECK )
> #if !defined(_GCC_PTRDIFF_T)
> #define _GCC_PTRDIFF_T
> --
> 2.25.4
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] aix: Fixinclude updates [PR98208]
2020-12-11 0:59 [PATCH] aix: Fixinclude updates [PR98208] Ilya Leoshkevich
2020-12-11 7:41 ` Richard Biener
@ 2020-12-11 12:51 ` Nathan Sidwell
2020-12-14 12:19 ` [PATCH v2] " Ilya Leoshkevich
1 sibling, 1 reply; 5+ messages in thread
From: Nathan Sidwell @ 2020-12-11 12:51 UTC (permalink / raw)
To: Ilya Leoshkevich, gcc-patches
On 12/10/20 7:59 PM, Ilya Leoshkevich wrote:
> Tested on gcc121 (x86_64 CentOS Linux 7). Ok for master?
>
>
>
> After 92648faa1cb2 ("aix: Fixinclude") make check-fixincludes began to
> fail (at least on gcc121 machine). Fix by updating fixincludes/tests
> and rerunning genfixes.
> diff --git a/fixincludes/tests/base/sys/types.h b/fixincludes/tests/base/sys/types.h
> index 683b5e93ecd..a318f9b713b 100644
> --- a/fixincludes/tests/base/sys/types.h
> +++ b/fixincludes/tests/base/sys/types.h
> @@ -9,6 +9,11 @@
>
>
>
> +#if defined( AIX_PHYSADR_T_CHECK )
> +typedef struct __physadr_s {
> +#endif /* AIX_PHYSADR_T_CHECK */
> +
I'm pretty sure this is wrong. I think the test_text in inclhack.def
should be a pre-fixed string that the testsuite presumably checks is
converted.
--
Nathan Sidwell
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] aix: Fixinclude updates [PR98208]
2020-12-11 12:51 ` Nathan Sidwell
@ 2020-12-14 12:19 ` Ilya Leoshkevich
2020-12-14 13:39 ` Nathan Sidwell
0 siblings, 1 reply; 5+ messages in thread
From: Ilya Leoshkevich @ 2020-12-14 12:19 UTC (permalink / raw)
To: Nathan Sidwell, gcc-patches
On Fri, 2020-12-11 at 07:51 -0500, Nathan Sidwell wrote:
>
> I'm pretty sure this is wrong. I think the test_text in
> inclhack.def
> should be a pre-fixed string that the testsuite presumably checks is
> converted.
You're right; I've added your change from the Bugzilla and updated the
expectation. Does the following look better?
After 92648faa1cb2 ("aix: Fixinclude") make check-fixincludes began to
fail (at least on gcc121 machine). Fix by updating fixincludes/tests
and rerunning genfixes.
Co-developed-by: Nathan Sidwell <nathan@acm.org>
fixincludes/ChangeLog:
2020-12-11 Ilya Leoshkevich <iii@linux.ibm.com>
* fixincl.x: Rerun genfixes.
* inclhack.def(aix_physadr_t): Change test_text to something
that needs to be replaced.
* tests/base/sys/types.h(aix_physadr_t): Add expectation.
---
fixincludes/fixincl.x | 4 ++--
fixincludes/inclhack.def | 2 +-
fixincludes/tests/base/sys/types.h | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 21439652bce..cc17edfba0b 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (fixincl.x)
*
- * It has been AutoGen-ed October 21, 2020 at 10:43:22 AM by AutoGen 5.18.16
+ * It has been AutoGen-ed December 9, 2020 at 11:16:08 AM by AutoGen 5.18.16
* From the definitions inclhack.def
* and the template file fixincl
*/
-/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Oct 21 10:43:22 EDT 2020
+/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Dec 9 11:16:08 EST 2020
*
* You must regenerate it. Use the ./genfixes script.
*
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 80c9adfb07c..3a4cfe06542 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -731,7 +731,7 @@ fix = {
select = "typedef[ \t]*struct[ \t]*([{][^}]*[}][ \t]*\\*[ \t]*physadr_t;)";
c_fix = format;
c_fix_arg = "typedef struct __physadr_s %1";
- test_text = "typedef struct __physadr_s {";
+ test_text = "typedef struct { random stuff } * physadr_t;";
};
/*
diff --git a/fixincludes/tests/base/sys/types.h b/fixincludes/tests/base/sys/types.h
index 683b5e93ecd..7340e76b175 100644
--- a/fixincludes/tests/base/sys/types.h
+++ b/fixincludes/tests/base/sys/types.h
@@ -9,6 +9,11 @@
+#if defined( AIX_PHYSADR_T_CHECK )
+typedef struct __physadr_s { random stuff } * physadr_t;
+#endif /* AIX_PHYSADR_T_CHECK */
+
+
#if defined( GNU_TYPES_CHECK )
#if !defined(_GCC_PTRDIFF_T)
#define _GCC_PTRDIFF_T
--
2.25.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] aix: Fixinclude updates [PR98208]
2020-12-14 12:19 ` [PATCH v2] " Ilya Leoshkevich
@ 2020-12-14 13:39 ` Nathan Sidwell
0 siblings, 0 replies; 5+ messages in thread
From: Nathan Sidwell @ 2020-12-14 13:39 UTC (permalink / raw)
To: Ilya Leoshkevich, gcc-patches
On 12/14/20 7:19 AM, Ilya Leoshkevich wrote:
> On Fri, 2020-12-11 at 07:51 -0500, Nathan Sidwell wrote:
>>
>> I'm pretty sure this is wrong. I think the test_text in
>> inclhack.def
>> should be a pre-fixed string that the testsuite presumably checks is
>> converted.
>
> You're right; I've added your change from the Bugzilla and updated the
> expectation. Does the following look better?
Yes thanks. I don;t really understand why the base/sys/types.h change
is needed, (surely there are other types.h fixincs?) But if this makes
the tests pass, so be it!
nathan
>
> After 92648faa1cb2 ("aix: Fixinclude") make check-fixincludes began to
> fail (at least on gcc121 machine). Fix by updating fixincludes/tests
> and rerunning genfixes.
>
> Co-developed-by: Nathan Sidwell <nathan@acm.org>
>
> fixincludes/ChangeLog:
>
> 2020-12-11 Ilya Leoshkevich <iii@linux.ibm.com>
>
> * fixincl.x: Rerun genfixes.
> * inclhack.def(aix_physadr_t): Change test_text to something
> that needs to be replaced.
> * tests/base/sys/types.h(aix_physadr_t): Add expectation.
> ---
> fixincludes/fixincl.x | 4 ++--
> fixincludes/inclhack.def | 2 +-
> fixincludes/tests/base/sys/types.h | 5 +++++
> 3 files changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
> index 21439652bce..cc17edfba0b 100644
> --- a/fixincludes/fixincl.x
> +++ b/fixincludes/fixincl.x
> @@ -2,11 +2,11 @@
> *
> * DO NOT EDIT THIS FILE (fixincl.x)
> *
> - * It has been AutoGen-ed October 21, 2020 at 10:43:22 AM by AutoGen 5.18.16
> + * It has been AutoGen-ed December 9, 2020 at 11:16:08 AM by AutoGen 5.18.16
> * From the definitions inclhack.def
> * and the template file fixincl
> */
> -/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Oct 21 10:43:22 EDT 2020
> +/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Dec 9 11:16:08 EST 2020
> *
> * You must regenerate it. Use the ./genfixes script.
> *
> diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
> index 80c9adfb07c..3a4cfe06542 100644
> --- a/fixincludes/inclhack.def
> +++ b/fixincludes/inclhack.def
> @@ -731,7 +731,7 @@ fix = {
> select = "typedef[ \t]*struct[ \t]*([{][^}]*[}][ \t]*\\*[ \t]*physadr_t;)";
> c_fix = format;
> c_fix_arg = "typedef struct __physadr_s %1";
> - test_text = "typedef struct __physadr_s {";
> + test_text = "typedef struct { random stuff } * physadr_t;";
> };
>
> /*
> diff --git a/fixincludes/tests/base/sys/types.h b/fixincludes/tests/base/sys/types.h
> index 683b5e93ecd..7340e76b175 100644
> --- a/fixincludes/tests/base/sys/types.h
> +++ b/fixincludes/tests/base/sys/types.h
> @@ -9,6 +9,11 @@
>
>
>
> +#if defined( AIX_PHYSADR_T_CHECK )
> +typedef struct __physadr_s { random stuff } * physadr_t;
> +#endif /* AIX_PHYSADR_T_CHECK */
> +
> +
> #if defined( GNU_TYPES_CHECK )
> #if !defined(_GCC_PTRDIFF_T)
> #define _GCC_PTRDIFF_T
>
--
Nathan Sidwell
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-14 13:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-11 0:59 [PATCH] aix: Fixinclude updates [PR98208] Ilya Leoshkevich
2020-12-11 7:41 ` Richard Biener
2020-12-11 12:51 ` Nathan Sidwell
2020-12-14 12:19 ` [PATCH v2] " Ilya Leoshkevich
2020-12-14 13:39 ` Nathan Sidwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).