public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jason Merrill <jason@redhat.com>
To: Jakub Jelinek <jakub@redhat.com>,
	Joseph Myers <joseph@codesourcery.com>,
	Bruce Korb <bkorb@gnu.org>,
	gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] fixincludes: Deal also with the _Float128x cases [PR107059]
Date: Tue, 4 Oct 2022 17:20:30 -0400	[thread overview]
Message-ID: <cb3f2f2a-9c10-9b90-5faf-6013cdf58d96@redhat.com> (raw)
In-Reply-To: <YzaYvq2n3/u8oVLd@tucnak>

On 9/30/22 03:20, Jakub Jelinek wrote:
> On Wed, Sep 28, 2022 at 08:19:43PM +0200, Jakub Jelinek via Gcc-patches wrote:
>> Another case are the following 3 snippets:
>> #  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
>> #   error "_Float128X supported but no constant suffix"
>> #  else
>> #   define __f128x(x) x##f128x
>> #  endif
>> ...
>> #  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
>> #   error "_Float128X supported but no complex type"
>> #  else
>> #   define __CFLOAT128X _Complex _Float128x
>> #  endif
>> ...
>> #  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
>> #   error "_Float128x supported but no type"
>> #  endif
>> but as no target has _Float128x right now and don't see it
>> coming soon, it isn't a big deal (on the glibc side it is of
>> course ok to adjust those).
> 
> This incremental patch deals handles the above 3 cases, so we
> fixinclude what glibc itself changed too.
> 
> Bootstrapped/regtested on x86_64-linux and i686-linux (together with the
> previously posted fixincludes/ change too), ok for trunk?

Both OK on Friday if no comments before then.

> 2022-09-30  Jakub Jelinek  <jakub@redhat.com>
> 
> 	PR bootstrap/107059
> 	* inclhack.def (glibc_cxx_floatn_5): New.
> 	* fixincl.x: Regenerated.
> 	* tests/base/bits/floatn.h: Regenerated.
> 
> --- fixincludes/inclhack.def.jj	2022-09-29 22:18:47.974402688 +0200
> +++ fixincludes/inclhack.def	2022-09-29 22:22:48.151145670 +0200
> @@ -2131,6 +2131,23 @@ fix = {
>   	EOT;
>   };
>   
> +fix = {
> +    hackname  = glibc_cxx_floatn_5;
> +    files     = bits/floatn.h, bits/floatn-common.h, "*/bits/floatn.h", "*/bits/floatn-common.h";
> +    select    = "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n"
> +		"([ \t]*#[ \t]+error \"_Float128[xX] supported but no )";
> +    c_fix     = format;
> +    c_fix_arg = "%1(defined __cplusplus && !__GNUC_PREREQ (13, 0))\n%2";
> +    test_text = <<-EOT
> +	#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
> +	#   error "_Float128X supported but no constant suffix"
> +	#  endif
> +	#  if !__GNUC_PREREQ (7, 0) || defined __cplusplus
> +	#   error "_Float128x supported but no type"
> +	#  endif
> +	EOT;
> +};
> +
>   /*  glibc-2.3.5 defines pthread mutex initializers incorrectly,
>    *  so we replace them with versions that correspond to the
>    *  definition.
> --- fixincludes/fixincl.x.jj	2022-09-29 22:18:47.975402675 +0200
> +++ fixincludes/fixincl.x	2022-09-29 22:22:55.675909244 +0200
> @@ -2,11 +2,11 @@
>    *
>    * DO NOT EDIT THIS FILE   (fixincl.x)
>    *
> - * It has been AutoGen-ed  September 28, 2022 at 07:56:15 PM by AutoGen 5.18.16
> + * It has been AutoGen-ed  September 29, 2022 at 10:22:55 PM by AutoGen 5.18.16
>    * From the definitions    inclhack.def
>    * and the template file   fixincl
>    */
> -/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Sep 28 19:56:15 CEST 2022
> +/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Sep 29 22:22:55 CEST 2022
>    *
>    * You must regenerate it.  Use the ./genfixes script.
>    *
> @@ -15,7 +15,7 @@
>    * certain ANSI-incompatible system header files which are fixed to work
>    * correctly with ANSI C and placed in a directory that GNU C will search.
>    *
> - * This file contains 271 fixup descriptions.
> + * This file contains 272 fixup descriptions.
>    *
>    * See README for more information.
>    *
> @@ -4273,6 +4273,43 @@ static const char* apzGlibc_Cxx_Floatn_4
>   
>   /* * * * * * * * * * * * * * * * * * * * * * * * * *
>    *
> + *  Description of Glibc_Cxx_Floatn_5 fix
> + */
> +tSCC zGlibc_Cxx_Floatn_5Name[] =
> +     "glibc_cxx_floatn_5";
> +
> +/*
> + *  File name selection pattern
> + */
> +tSCC zGlibc_Cxx_Floatn_5List[] =
> +  "bits/floatn.h\0bits/floatn-common.h\0*/bits/floatn.h\0*/bits/floatn-common.h\0";
> +/*
> + *  Machine/OS name selection pattern
> + */
> +#define apzGlibc_Cxx_Floatn_5Machs (const char**)NULL
> +
> +/*
> + *  content selection pattern - do fix if pattern found
> + */
> +tSCC zGlibc_Cxx_Floatn_5Select0[] =
> +       "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n\
> +([ \t]*#[ \t]+error \"_Float128[xX] supported but no )";
> +
> +#define    GLIBC_CXX_FLOATN_5_TEST_CT  1
> +static tTestDesc aGlibc_Cxx_Floatn_5Tests[] = {
> +  { TT_EGREP,    zGlibc_Cxx_Floatn_5Select0, (regex_t*)NULL }, };
> +
> +/*
> + *  Fix Command Arguments for Glibc_Cxx_Floatn_5
> + */
> +static const char* apzGlibc_Cxx_Floatn_5Patch[] = {
> +    "format",
> +    "%1(defined __cplusplus && !__GNUC_PREREQ (13, 0))\n\
> +%2",
> +    (char*)NULL };
> +
> +/* * * * * * * * * * * * * * * * * * * * * * * * * *
> + *
>    *  Description of Glibc_Mutex_Init fix
>    */
>   tSCC zGlibc_Mutex_InitName[] =
> @@ -11038,9 +11075,9 @@ static const char* apzX11_SprintfPatch[]
>    *
>    *  List of all fixes
>    */
> -#define REGEX_COUNT          309
> +#define REGEX_COUNT          310
>   #define MACH_LIST_SIZE_LIMIT 187
> -#define FIX_COUNT            271
> +#define FIX_COUNT            272
>   
>   /*
>    *  Enumerate the fixes
> @@ -11147,6 +11184,7 @@ typedef enum {
>       GLIBC_CXX_FLOATN_2_FIXIDX,
>       GLIBC_CXX_FLOATN_3_FIXIDX,
>       GLIBC_CXX_FLOATN_4_FIXIDX,
> +    GLIBC_CXX_FLOATN_5_FIXIDX,
>       GLIBC_MUTEX_INIT_FIXIDX,
>       GLIBC_STDINT_FIXIDX,
>       GLIBC_STRNCPY_FIXIDX,
> @@ -11825,6 +11863,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
>        GLIBC_CXX_FLOATN_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
>        aGlibc_Cxx_Floatn_4Tests,   apzGlibc_Cxx_Floatn_4Patch, 0 },
>   
> +  {  zGlibc_Cxx_Floatn_5Name,    zGlibc_Cxx_Floatn_5List,
> +     apzGlibc_Cxx_Floatn_5Machs,
> +     GLIBC_CXX_FLOATN_5_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
> +     aGlibc_Cxx_Floatn_5Tests,   apzGlibc_Cxx_Floatn_5Patch, 0 },
> +
>     {  zGlibc_Mutex_InitName,    zGlibc_Mutex_InitList,
>        apzGlibc_Mutex_InitMachs,
>        GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY,
> --- fixincludes/tests/base/bits/floatn.h.jj	2022-09-29 22:18:47.976402661 +0200
> +++ fixincludes/tests/base/bits/floatn.h	2022-09-29 22:23:19.703717787 +0200
> @@ -84,3 +84,13 @@ typedef long double _Float128;
>   #   define __CFLOAT128 _Complex long double
>   #  endif
>   #endif  /* GLIBC_CXX_FLOATN_4_CHECK */
> +
> +
> +#if defined( GLIBC_CXX_FLOATN_5_CHECK )
> +#  if !__GNUC_PREREQ (7, 0) || (defined __cplusplus && !__GNUC_PREREQ (13, 0))
> +#   error "_Float128X supported but no constant suffix"
> +#  endif
> +#  if !__GNUC_PREREQ (7, 0) || (defined __cplusplus && !__GNUC_PREREQ (13, 0))
> +#   error "_Float128x supported but no type"
> +#  endif
> +#endif  /* GLIBC_CXX_FLOATN_5_CHECK */
> 
> 
> 	Jakub
> 


      parent reply	other threads:[~2022-10-04 21:20 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <alpine.DEB.2.22.394.2209280022150.425621@digraph.polyomino.org.uk>
2022-09-28 18:19 ` [PATCH] fixincludes: Fix up powerpc floatn.h tweaks [PR107059] Jakub Jelinek
2022-09-30  7:20   ` [PATCH] fixincludes: Deal also with the _Float128x cases [PR107059] Jakub Jelinek
2022-10-04 16:57     ` will schmidt
2022-10-04 21:20     ` Jason Merrill [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cb3f2f2a-9c10-9b90-5faf-6013cdf58d96@redhat.com \
    --to=jason@redhat.com \
    --cc=bkorb@gnu.org \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=jakub@redhat.com \
    --cc=joseph@codesourcery.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).