From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 4EF783858016 for ; Wed, 28 Sep 2022 18:19:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4EF783858016 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664389193; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=6jNr1REq4JsgVZMS57qpp+JTguW+d1Ddi2C3AjMLffU=; b=VIPASj/aTRn5nFff7o01L9AeObkHjxyNc02WnbY10tndBJKjaKkHdXfI65UaVZGkIayJPS cPHpr6AnnUCt3krxAOFUlqerVuQKT3CFL7lhd5E6ShYLAZ4wWGWgrUHbXmIQyMLdawL5kd M2WTrpWVy5m/Xom+Cr8Uo5H6xeRSLBQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-382-gNePXfvWMKqRitSjb5WDPQ-1; Wed, 28 Sep 2022 14:19:49 -0400 X-MC-Unique: gNePXfvWMKqRitSjb5WDPQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DDBE13C11EA3; Wed, 28 Sep 2022 18:19:48 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.194]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9EA60C15BA4; Wed, 28 Sep 2022 18:19:48 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 28SIJjLn3884686 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 28 Sep 2022 20:19:45 +0200 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 28SIJiPK3884685; Wed, 28 Sep 2022 20:19:44 +0200 Date: Wed, 28 Sep 2022 20:19:43 +0200 From: Jakub Jelinek To: Joseph Myers , Bruce Korb , Jason Merrill Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] fixincludes: Fix up powerpc floatn.h tweaks [PR107059] Message-ID: Reply-To: Jakub Jelinek References: MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi! On Wed, Sep 28, 2022 at 12:23:31AM +0000, Joseph Myers wrote: > In general the changes match those made by fixincludes, though I think > the ones in sysdeps/powerpc/bits/floatn.h, where the header tests > __LDBL_MANT_DIG__ == 113 or uses #elif, wouldn't match the existing > fixincludes patterns. You're right, missed that. The header has: /* Defined to a complex binary128 type if __HAVE_FLOAT128 is 1. */ # if __HAVE_FLOAT128 # if __LDBL_MANT_DIG__ == 113 && defined __cplusplus typedef long double _Float128; # define __CFLOAT128 _Complex long double # elif !__GNUC_PREREQ (7, 0) || defined __cplusplus /* The type _Float128 exist for powerpc only since GCC 7.0. */ typedef __float128 _Float128; /* Add a typedef for older GCC and C++ compilers which don't natively support _Complex _Float128. */ typedef _Complex float __cfloat128 __attribute__ ((__mode__ (__KC__))); # define __CFLOAT128 __cfloat128 # else # define __CFLOAT128 _Complex _Float128 # endif # endif and my current rules don't do anything about that. The following patch fixes that. I've run additionally MACRO_LIST=`pwd`/../gcc/macro_list TARGET_MACHINE=x86_64-pc-linux-gnu ../fixincludes/fixinc.sh /tmp/include-fixed `echo /usr/src/libc | sed -e :a -e 's,[^/]*/\.\.\/,,' -e ta` in the builddir/fixincludes directory where /usr/src/libc is latest glibc trunk checkout and seems the remaining defined __cplusplus cases in the floatn.h and floatn-common.h headers are ok or acceptable. The remaining cases are: #if __GNUC_PREREQ (7, 0) && !defined __cplusplus # define __HAVE_FLOATN_NOT_TYPEDEF 1 #else # define __HAVE_FLOATN_NOT_TYPEDEF 0 #endif which is IMHO ok because this is only used in tgmath.h or tgmath-like math.h stuff which is C only, as C++ doesn't have _Generic. 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). OT, besides floatn.h and floatn-common.h headers, the only one remaining in /tmp/include-fixed is sysdeps/arm/unwind.h, perhaps -#if defined(linux) || defined(__NetBSD__) +#if defined(__linux__) || defined(__NetBSD__) should be done in that header (and libgcc/config/arm/unwind-arm.h too). Ok for trunk? BTW, we have some multi-arch related issue with fixincludes too, apparently fixincludes never worked properly on multi-arch (aka Debian/Ubuntu) :(. 2022-09-28 Jakub Jelinek PR bootstrap/107059 * inclhack.def (glibc_cxx_floatn_2): Handle #elif the same as #if. (glibc_cxx_floatn_4): New. * fixincl.x: Regenerated. * tests/base/bits/floatn.h: Regenerated. --- gcc/inclhack.def.jj 2022-09-27 12:29:21.309769836 +0200 +++ gcc/inclhack.def 2022-09-28 19:56:07.222783768 +0200 @@ -2060,11 +2060,11 @@ fix = { fix = { hackname = glibc_cxx_floatn_2; 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" + select = "^([ \t]*#[ \t]*(el)?if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n" "(([ \t]*/\\*[^\n]*\\*/\n)?" "[ \t]*typedef[ \t]+[^\n]*[ \t]+_Float(16|32|64|128)x?([ \t]+__attribute__ \\(\\(__mode__ \\(__HF__\\)\\)\\))?;)"; c_fix = format; - c_fix_arg = "%1(defined __cplusplus && !__GNUC_PREREQ (13, 0))\n%2"; + c_fix_arg = "%1(defined __cplusplus && !__GNUC_PREREQ (13, 0))\n%3"; test_text = <<-EOT # if !__GNUC_PREREQ (7, 0) || defined __cplusplus typedef float _Float16 __attribute__ ((__mode__ (__HF__))); @@ -2072,6 +2072,10 @@ fix = { # if !__GNUC_PREREQ (7, 0) || defined __cplusplus typedef __float128 _Float128; # endif + # if 0 + # elif !__GNUC_PREREQ (7, 0) || defined __cplusplus + typedef __float128 _Float128; + # endif EOT; }; @@ -2110,6 +2114,22 @@ fix = { # endif EOT; }; + +fix = { + hackname = glibc_cxx_floatn_4; + files = bits/floatn.h, "*/bits/floatn.h"; + select = "^([ \t]*#[ \t]*if __LDBL_MANT_DIG__ == 113 && )defined __cplusplus\n" + "(([ \t]*/\\*[^\n]*\\*/\n)?" + "[ \t]*typedef[ \t]+[^\n]*[ \t]+_Float128;)"; + c_fix = format; + c_fix_arg = "%1defined __cplusplus && !__GNUC_PREREQ (13, 0)\n%2"; + test_text = <<-EOT + # if __LDBL_MANT_DIG__ == 113 && defined __cplusplus + typedef long double _Float128; + # define __CFLOAT128 _Complex long double + # endif + EOT; +}; /* glibc-2.3.5 defines pthread mutex initializers incorrectly, * so we replace them with versions that correspond to the --- gcc/fixincl.x.jj 2022-09-27 12:29:21.328769578 +0200 +++ gcc/fixincl.x 2022-09-28 19:56:15.990125976 +0200 @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed September 27, 2022 at 12:21:44 PM by AutoGen 5.18.16 + * It has been AutoGen-ed September 28, 2022 at 07:56:15 PM by AutoGen 5.18.16 * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Sep 27 12:21:44 CEST 2022 +/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Sep 28 19:56:15 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 270 fixup descriptions. + * This file contains 271 fixup descriptions. * * See README for more information. * @@ -4167,7 +4167,7 @@ tSCC zGlibc_Cxx_Floatn_2List[] = * content selection pattern - do fix if pattern found */ tSCC zGlibc_Cxx_Floatn_2Select0[] = - "^([ \t]*#[ \t]*if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n\ + "^([ \t]*#[ \t]*(el)?if !__GNUC_PREREQ \\(7, 0\\) \\|\\| )defined __cplusplus\n\ (([ \t]*/\\*[^\n\ ]*\\*/\n\ )?[ \t]*typedef[ \t]+[^\n\ @@ -4183,7 +4183,7 @@ static tTestDesc aGlibc_Cxx_Floatn_2Test static const char* apzGlibc_Cxx_Floatn_2Patch[] = { "format", "%1(defined __cplusplus && !__GNUC_PREREQ (13, 0))\n\ -%2", +%3", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * @@ -4233,6 +4233,46 @@ static const char* apzGlibc_Cxx_Floatn_3 /* * * * * * * * * * * * * * * * * * * * * * * * * * * + * Description of Glibc_Cxx_Floatn_4 fix + */ +tSCC zGlibc_Cxx_Floatn_4Name[] = + "glibc_cxx_floatn_4"; + +/* + * File name selection pattern + */ +tSCC zGlibc_Cxx_Floatn_4List[] = + "bits/floatn.h\0*/bits/floatn.h\0"; +/* + * Machine/OS name selection pattern + */ +#define apzGlibc_Cxx_Floatn_4Machs (const char**)NULL + +/* + * content selection pattern - do fix if pattern found + */ +tSCC zGlibc_Cxx_Floatn_4Select0[] = + "^([ \t]*#[ \t]*if __LDBL_MANT_DIG__ == 113 && )defined __cplusplus\n\ +(([ \t]*/\\*[^\n\ +]*\\*/\n\ +)?[ \t]*typedef[ \t]+[^\n\ +]*[ \t]+_Float128;)"; + +#define GLIBC_CXX_FLOATN_4_TEST_CT 1 +static tTestDesc aGlibc_Cxx_Floatn_4Tests[] = { + { TT_EGREP, zGlibc_Cxx_Floatn_4Select0, (regex_t*)NULL }, }; + +/* + * Fix Command Arguments for Glibc_Cxx_Floatn_4 + */ +static const char* apzGlibc_Cxx_Floatn_4Patch[] = { + "format", + "%1defined __cplusplus && !__GNUC_PREREQ (13, 0)\n\ +%2", + (char*)NULL }; + +/* * * * * * * * * * * * * * * * * * * * * * * * * * + * * Description of Glibc_Mutex_Init fix */ tSCC zGlibc_Mutex_InitName[] = @@ -10998,9 +11038,9 @@ static const char* apzX11_SprintfPatch[] * * List of all fixes */ -#define REGEX_COUNT 308 +#define REGEX_COUNT 309 #define MACH_LIST_SIZE_LIMIT 187 -#define FIX_COUNT 270 +#define FIX_COUNT 271 /* * Enumerate the fixes @@ -11106,6 +11146,7 @@ typedef enum { GLIBC_CXX_FLOATN_1_FIXIDX, GLIBC_CXX_FLOATN_2_FIXIDX, GLIBC_CXX_FLOATN_3_FIXIDX, + GLIBC_CXX_FLOATN_4_FIXIDX, GLIBC_MUTEX_INIT_FIXIDX, GLIBC_STDINT_FIXIDX, GLIBC_STRNCPY_FIXIDX, @@ -11779,6 +11820,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = { GLIBC_CXX_FLOATN_3_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, aGlibc_Cxx_Floatn_3Tests, apzGlibc_Cxx_Floatn_3Patch, 0 }, + { zGlibc_Cxx_Floatn_4Name, zGlibc_Cxx_Floatn_4List, + apzGlibc_Cxx_Floatn_4Machs, + GLIBC_CXX_FLOATN_4_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE, + aGlibc_Cxx_Floatn_4Tests, apzGlibc_Cxx_Floatn_4Patch, 0 }, + { zGlibc_Mutex_InitName, zGlibc_Mutex_InitList, apzGlibc_Mutex_InitMachs, GLIBC_MUTEX_INIT_TEST_CT, FD_MACH_ONLY, --- gcc/tests/base/bits/floatn.h.jj 2022-09-28 19:59:27.625087388 +0200 +++ gcc/tests/base/bits/floatn.h 2022-09-28 19:56:30.855465791 +0200 @@ -45,6 +45,10 @@ typedef float _Float16 __attribute__ ((_ # if !__GNUC_PREREQ (7, 0) || (defined __cplusplus && !__GNUC_PREREQ (13, 0)) typedef __float128 _Float128; # endif +# if 0 +# elif !__GNUC_PREREQ (7, 0) || (defined __cplusplus && !__GNUC_PREREQ (13, 0)) +typedef __float128 _Float128; +# endif #endif /* GLIBC_CXX_FLOATN_2_CHECK */ @@ -72,3 +76,11 @@ typedef _Complex float __cfloat128 __att # define __CFLOAT64 _Complex _Float64 # endif #endif /* GLIBC_CXX_FLOATN_3_CHECK */ + + +#if defined( GLIBC_CXX_FLOATN_4_CHECK ) +# if __LDBL_MANT_DIG__ == 113 && defined __cplusplus && !__GNUC_PREREQ (13, 0) +typedef long double _Float128; +# define __CFLOAT128 _Complex long double +# endif +#endif /* GLIBC_CXX_FLOATN_4_CHECK */ Jakub