From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 4D23E3858C62 for ; Thu, 1 Feb 2024 17:54:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4D23E3858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4D23E3858C62 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::42f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706810100; cv=none; b=mU7BYZ6ccvWYe3OsF6PzGDQdZLxOkx7wcH6mJrtn+GBMbo07UBATE2YBC/J00U9XbPZ3F1qy6f2U1DWFhYXGcpxJsbCQpWSHiuV8pFuLakW8YkQqU3VuEt+xF1X7nv0zdyRgQpH+rwwE47qsUOMoi2CKq6OyttRlUXurVaPT3m8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706810100; c=relaxed/simple; bh=P7Axj4VBpntRYQiKitguqEWaGOod5vUp8Y0cRzKu7MA=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=ksCrSflUpxROGsv/cEBvjp8WiQ7y4E0Qo9hWHBJ8+VlmwDtvTfmbxRqKKRX+WoN75vukroK34LzsC55HkKW8QEUmZgMge/q506NvJzY+d5fC55Z4lYL7zDyVHy0QTFlwuuGuEluCLzxYk8rxvG7zn/UVu7egFN+wBbfyuctidig= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6ddc2a78829so831934b3a.3 for ; Thu, 01 Feb 2024 09:54:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706810094; x=1707414894; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=YHJEbtJQ95Ncl1UIrj71usp8ZCzhuPYkcgi5jpja+zw=; b=mIRgrNUONNzmLmrCTuPNz05BvLAe+Lel8wPkhYvd+Pz96HbifZV9otHdSIFcKyyHrx T2qlLP4s7yM6va49jvz5TcJ86FllEMwEv+YuMnEZdUbjb8gR+zzMw03VWk45T9zCPvy0 a8kfj0tXB02JqKbdkqCeQma/uM5z3un3QkMvddZoghSRHpXJnkldDM50crH0XFOus8FH orfcNnKoKUcicD9yZ/poVSFp2RP1glj9pcocHlARPlCQFVMmRRZWJp29260XmM83JQur O7iXW2hRsON9ctFDLoslkTvkDf9opKqBcSr6v/Gpm2yjdeAFZmWmo8nF8Q86siWsfbb6 jK3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706810094; x=1707414894; h=content-transfer-encoding:in-reply-to:organization:from:references :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YHJEbtJQ95Ncl1UIrj71usp8ZCzhuPYkcgi5jpja+zw=; b=WoZWcPouIQVFNH1Y0YLL8cXvNVJLR7+EaJWg/u7isw8UBduAv2zwpuF6j95tKdepjj vYZbwrMMjU83g+pemGAYkPMnlzqS4xb5D1L1U7zeX8HlHX9+kmAlvVrG2JTBER2cCJ2r QrjG/hRFki7p3799LqAxU9fw/Idx+DhQPlCsXDsTMTjUgAJxQAe7eE7GFdEdebghvdVO UAOGuBFCKO8JUgB6H2YulLqmhRFlITOCMni22sLeaohALJF0zB+iB4NJR+YJq3lUYhTk SAuWZ3brI7d17yFlEE3r0q0OdMmfUDeaqLJFo4LYNfulUeQNn2WDQzOU7n+4Ip+pfqCT VjXg== X-Gm-Message-State: AOJu0Yw6F6G7jVvPuDYF/zjRyCgmISXRZarRwwlLby7784anyn3tXvaP 70C5i+uvqkROumQAYsmWC4ZTq2VR/9Zn5wbj0cG7S/LjlvBsURYM1Hma89dTGqFJmZwXgp48eN2 Y X-Google-Smtp-Source: AGHT+IF06kLWHy5VwR1YAzKo1v/4nyynTdsdEP1JzbltBT9z2RkrHp870c30QIC84ELq7QbGgnzCuw== X-Received: by 2002:a05:6a00:17a9:b0:6dd:86b2:a4a5 with SMTP id s41-20020a056a0017a900b006dd86b2a4a5mr6748635pfg.5.1706810094108; Thu, 01 Feb 2024 09:54:54 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXgCCNGs2GHO60WxnsptQQPv0Lgr/VMXEg4K9xdxgRT6Nn5ymW4R9J98SG1ZZqgLyS4GV88GleDns0k/6ENqBEf9nJbOxUaO+o/ Received: from ?IPV6:2804:1b3:a7c3:574b:1518:43f4:7a80:c00f? ([2804:1b3:a7c3:574b:1518:43f4:7a80:c00f]) by smtp.gmail.com with ESMTPSA id x17-20020a056a00271100b006ddc2cf3662sm13442pfv.184.2024.02.01.09.54.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 01 Feb 2024 09:54:53 -0800 (PST) Message-ID: <3bc07f21-5eff-48d5-8ce5-f6f80460fb82@linaro.org> Date: Thu, 1 Feb 2024 14:54:52 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: Rename c2x / gnu2x tests to c23 / gnu23 Content-Language: en-US To: Joseph Myers , libc-alpha@sourceware.org References: From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: On 01/02/24 14:43, Joseph Myers wrote: > Complete the internal renaming from "C2X" and related names in GCC by > renaming *-c2x and *-gnu2x tests to *-c23 and *-gnu23. > > Tested for x86_64, and with build-many-glibcs.py for powerpc64le. Seems straightforward, and LGTM. > > diff --git a/stdio-common/Makefile b/stdio-common/Makefile > index 60a7f4cff3..6447b6b444 100644 > --- a/stdio-common/Makefile > +++ b/stdio-common/Makefile > @@ -240,7 +240,7 @@ tests := \ > tst-renameat2 \ > tst-rndseek \ > tst-scanf-binary-c11 \ > - tst-scanf-binary-c2x \ > + tst-scanf-binary-c23 \ > tst-scanf-binary-gnu11 \ > tst-scanf-binary-gnu89 \ > tst-scanf-intn \ > @@ -495,7 +495,7 @@ CFLAGS-tst-memstream-string.c += -fno-builtin-fprintf > # the test for that version uses -std=c11 and then _ISOC23_SOURCE is defined in > # the test as needed. > CFLAGS-tst-scanf-binary-c11.c += -std=c11 -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-scanf-binary-c2x.c += -std=c11 -DOBJPFX=\"$(objpfx)\" > +CFLAGS-tst-scanf-binary-c23.c += -std=c11 -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-scanf-binary-gnu11.c += -std=gnu11 -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-scanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\" > > diff --git a/stdio-common/tst-scanf-binary-c2x.c b/stdio-common/tst-scanf-binary-c23.c > similarity index 100% > rename from stdio-common/tst-scanf-binary-c2x.c > rename to stdio-common/tst-scanf-binary-c23.c > diff --git a/stdlib/Makefile b/stdlib/Makefile > index e9f9c7856d..8b0ac63ddb 100644 > --- a/stdlib/Makefile > +++ b/stdlib/Makefile > @@ -337,9 +337,9 @@ tests := \ > tst-strtod6 \ > tst-strtol \ > tst-strtol-binary-c11 \ > - tst-strtol-binary-c2x \ > + tst-strtol-binary-c23 \ > tst-strtol-binary-gnu11 \ > - tst-strtol-binary-gnu2x \ > + tst-strtol-binary-gnu23 \ > tst-strtol-locale \ > tst-strtoll \ > tst-swapcontext1 \ > @@ -527,9 +527,9 @@ CFLAGS-testmb.c += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Werror > # (added in GCC 9), so the tests for those versions use -std=c11 and -std=gnu11 > # and then _ISOC23_SOURCE is defined in the test as needed. > CFLAGS-tst-strtol-binary-c11.c += -std=c11 > -CFLAGS-tst-strtol-binary-c2x.c += -std=c11 > +CFLAGS-tst-strtol-binary-c23.c += -std=c11 > CFLAGS-tst-strtol-binary-gnu11.c += -std=gnu11 > -CFLAGS-tst-strtol-binary-gnu2x.c += -std=gnu11 > +CFLAGS-tst-strtol-binary-gnu23.c += -std=gnu11 > > > # Run a test on the header files we use. > diff --git a/stdlib/tst-strtol-binary-c2x.c b/stdlib/tst-strtol-binary-c23.c > similarity index 100% > rename from stdlib/tst-strtol-binary-c2x.c > rename to stdlib/tst-strtol-binary-c23.c > diff --git a/stdlib/tst-strtol-binary-gnu2x.c b/stdlib/tst-strtol-binary-gnu23.c > similarity index 100% > rename from stdlib/tst-strtol-binary-gnu2x.c > rename to stdlib/tst-strtol-binary-gnu23.c > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > index 20cb2dbe35..910c0198eb 100644 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > @@ -346,11 +346,11 @@ endif > > ifeq ($(subdir), stdio-common) > tests += tst-ibm128-scanf-binary-c11 \ > - tst-ibm128-scanf-binary-c2x \ > + tst-ibm128-scanf-binary-c23 \ > tst-ibm128-scanf-binary-gnu11 \ > tst-ibm128-scanf-binary-gnu89 \ > tst-ieee128-scanf-binary-c11 \ > - tst-ieee128-scanf-binary-c2x \ > + tst-ieee128-scanf-binary-c23 \ > tst-ieee128-scanf-binary-gnu11 \ > tst-ieee128-scanf-binary-gnu89 > > @@ -360,7 +360,7 @@ tests += tst-ibm128-scanf-binary-c11 \ > # the test as needed. > CFLAGS-tst-ibm128-scanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \ > -std=c11 -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-ibm128-scanf-binary-c2x.c += -mabi=ibmlongdouble -Wno-psabi \ > +CFLAGS-tst-ibm128-scanf-binary-c23.c += -mabi=ibmlongdouble -Wno-psabi \ > -std=c11 -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-ibm128-scanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \ > -std=gnu11 -DOBJPFX=\"$(objpfx)\" > @@ -369,7 +369,7 @@ CFLAGS-tst-ibm128-scanf-binary-gnu89.c += -mabi=ibmlongdouble -Wno-psabi \ > CFLAGS-tst-ieee128-scanf-binary-c11.c += -mfloat128 -mabi=ieeelongdouble \ > -Wno-psabi -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-ieee128-scanf-binary-c2x.c += -mfloat128 -mabi=ieeelongdouble \ > +CFLAGS-tst-ieee128-scanf-binary-c23.c += -mfloat128 -mabi=ieeelongdouble \ > -Wno-psabi -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-ieee128-scanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \ > @@ -383,11 +383,11 @@ endif > > ifeq ($(subdir), wcsmbs) > tests += tst-ibm128-wscanf-binary-c11 \ > - tst-ibm128-wscanf-binary-c2x \ > + tst-ibm128-wscanf-binary-c23 \ > tst-ibm128-wscanf-binary-gnu11 \ > tst-ibm128-wscanf-binary-gnu89 \ > tst-ieee128-wscanf-binary-c11 \ > - tst-ieee128-wscanf-binary-c2x \ > + tst-ieee128-wscanf-binary-c23 \ > tst-ieee128-wscanf-binary-gnu11 \ > tst-ieee128-wscanf-binary-gnu89 > > @@ -397,7 +397,7 @@ tests += tst-ibm128-wscanf-binary-c11 \ > # the test as needed. > CFLAGS-tst-ibm128-wscanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \ > -std=c11 -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-ibm128-wscanf-binary-c2x.c += -mabi=ibmlongdouble -Wno-psabi \ > +CFLAGS-tst-ibm128-wscanf-binary-c23.c += -mabi=ibmlongdouble -Wno-psabi \ > -std=c11 -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-ibm128-wscanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \ > -std=gnu11 -DOBJPFX=\"$(objpfx)\" > @@ -406,7 +406,7 @@ CFLAGS-tst-ibm128-wscanf-binary-gnu89.c += -mabi=ibmlongdouble -Wno-psabi \ > CFLAGS-tst-ieee128-wscanf-binary-c11.c += -mfloat128 -mabi=ieeelongdouble \ > -Wno-psabi -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-ieee128-wscanf-binary-c2x.c += -mfloat128 -mabi=ieeelongdouble \ > +CFLAGS-tst-ieee128-wscanf-binary-c23.c += -mfloat128 -mabi=ieeelongdouble \ > -Wno-psabi -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-ieee128-wscanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \ > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c > new file mode 100644 > index 0000000000..982d33557e > --- /dev/null > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c > @@ -0,0 +1,2 @@ > +#define STDX "ibm128-" > +#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c > deleted file mode 100644 > index f8bb2e4be3..0000000000 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define STDX "ibm128-" > -#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c > new file mode 100644 > index 0000000000..594afd51e9 > --- /dev/null > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c > @@ -0,0 +1,2 @@ > +#define STDX "ibm128-" > +#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c > deleted file mode 100644 > index bf0c3da75e..0000000000 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define STDX "ibm128-" > -#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c > new file mode 100644 > index 0000000000..ce25ef0802 > --- /dev/null > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c > @@ -0,0 +1,2 @@ > +#define STDX "ieee128-" > +#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c > deleted file mode 100644 > index d09c21394c..0000000000 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define STDX "ieee128-" > -#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c > new file mode 100644 > index 0000000000..c0b52338c0 > --- /dev/null > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c > @@ -0,0 +1,2 @@ > +#define STDX "ieee128-" > +#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c > deleted file mode 100644 > index 7e2d27c6d2..0000000000 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define STDX "ieee128-" > -#include > diff --git a/sysdeps/ieee754/ldbl-opt/Makefile b/sysdeps/ieee754/ldbl-opt/Makefile > index f20c267081..74788ac999 100644 > --- a/sysdeps/ieee754/ldbl-opt/Makefile > +++ b/sysdeps/ieee754/ldbl-opt/Makefile > @@ -232,7 +232,7 @@ endif > > ifeq ($(subdir), stdio-common) > tests += tst-nldbl-scanf-binary-c11 \ > - tst-nldbl-scanf-binary-c2x \ > + tst-nldbl-scanf-binary-c23 \ > tst-nldbl-scanf-binary-gnu11 \ > tst-nldbl-scanf-binary-gnu89 > > @@ -242,7 +242,7 @@ tests += tst-nldbl-scanf-binary-c11 \ > # the test as needed. > CFLAGS-tst-nldbl-scanf-binary-c11.c += -mlong-double-64 -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-nldbl-scanf-binary-c2x.c += -mlong-double-64 -std=c11 \ > +CFLAGS-tst-nldbl-scanf-binary-c23.c += -mlong-double-64 -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-nldbl-scanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \ > -DOBJPFX=\"$(objpfx)\" > @@ -253,7 +253,7 @@ endif > > ifeq ($(subdir), wcsmbs) > tests += tst-nldbl-wscanf-binary-c11 \ > - tst-nldbl-wscanf-binary-c2x \ > + tst-nldbl-wscanf-binary-c23 \ > tst-nldbl-wscanf-binary-gnu11 \ > tst-nldbl-wscanf-binary-gnu89 > > @@ -263,7 +263,7 @@ tests += tst-nldbl-wscanf-binary-c11 \ > # the test as needed. > CFLAGS-tst-nldbl-wscanf-binary-c11.c += -mlong-double-64 -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-nldbl-wscanf-binary-c2x.c += -mlong-double-64 -std=c11 \ > +CFLAGS-tst-nldbl-wscanf-binary-c23.c += -mlong-double-64 -std=c11 \ > -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-nldbl-wscanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \ > -DOBJPFX=\"$(objpfx)\" > diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c > new file mode 100644 > index 0000000000..f30d9501f8 > --- /dev/null > +++ b/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c > @@ -0,0 +1,2 @@ > +#define STDX "nldbl-" > +#include > diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c > deleted file mode 100644 > index 4e0cf7570f..0000000000 > --- a/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define STDX "nldbl-" > -#include > diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c > new file mode 100644 > index 0000000000..0fd61276d1 > --- /dev/null > +++ b/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c > @@ -0,0 +1,2 @@ > +#define STDX "nldbl-" > +#include > diff --git a/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c b/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c > deleted file mode 100644 > index 7637aab0d4..0000000000 > --- a/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c > +++ /dev/null > @@ -1,2 +0,0 @@ > -#define STDX "nldbl-" > -#include > diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile > index 5214eb40ad..9d568d4f44 100644 > --- a/sysdeps/powerpc/powerpc64/le/Makefile > +++ b/sysdeps/powerpc/powerpc64/le/Makefile > @@ -161,7 +161,7 @@ CFLAGS-printf_size.c = $(type-float128-CFLAGS) > #Older GCC (<10) doesn't like -mabi=ieeelongdouble and -mlong-double-64. > $(foreach suf,$(all-object-suffixes),\ > $(objpfx)tst-nldbl-scanf-binary-c11$(suf) \ > - $(objpfx)tst-nldbl-scanf-binary-c2x$(suf) \ > + $(objpfx)tst-nldbl-scanf-binary-c23$(suf) \ > $(objpfx)tst-nldbl-scanf-binary-gnu11$(suf) \ > $(objpfx)tst-nldbl-scanf-binary-gnu89$(suf) \ > ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) > @@ -171,7 +171,7 @@ endif > ifeq ($(subdir), wcsmbs) > $(foreach suf,$(all-object-suffixes),\ > $(objpfx)tst-nldbl-wscanf-binary-c11$(suf) \ > - $(objpfx)tst-nldbl-wscanf-binary-c2x$(suf) \ > + $(objpfx)tst-nldbl-wscanf-binary-c23$(suf) \ > $(objpfx)tst-nldbl-wscanf-binary-gnu11$(suf) \ > $(objpfx)tst-nldbl-wscanf-binary-gnu89$(suf) \ > ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) > diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile > index b64a5e1ce5..f3333c6a4b 100644 > --- a/wcsmbs/Makefile > +++ b/wcsmbs/Makefile > @@ -188,14 +188,14 @@ tests := \ > tst-wcstod-round \ > tst-wcstof \ > tst-wcstol-binary-c11 \ > - tst-wcstol-binary-c2x \ > + tst-wcstol-binary-c23 \ > tst-wcstol-binary-gnu11 \ > - tst-wcstol-binary-gnu2x \ > + tst-wcstol-binary-gnu23 \ > tst-wcstol-locale \ > tst-wprintf-binary \ > tst-wprintf-intn \ > tst-wscanf-binary-c11 \ > - tst-wscanf-binary-c2x \ > + tst-wscanf-binary-c23 \ > tst-wscanf-binary-gnu11 \ > tst-wscanf-binary-gnu89 \ > tst-wscanf-intn \ > @@ -290,10 +290,10 @@ $(objpfx)tst-wcstod-nan-sign: $(libm) > # (added in GCC 9), so the tests for those versions use -std=c11 and -std=gnu11 > # and then _ISOC23_SOURCE is defined in the test as needed. > CFLAGS-tst-wcstol-binary-c11.c += -std=c11 > -CFLAGS-tst-wcstol-binary-c2x.c += -std=c11 > +CFLAGS-tst-wcstol-binary-c23.c += -std=c11 > CFLAGS-tst-wcstol-binary-gnu11.c += -std=gnu11 > -CFLAGS-tst-wcstol-binary-gnu2x.c += -std=gnu11 > +CFLAGS-tst-wcstol-binary-gnu23.c += -std=gnu11 > CFLAGS-tst-wscanf-binary-c11.c += -std=c11 -DOBJPFX=\"$(objpfx)\" > -CFLAGS-tst-wscanf-binary-c2x.c += -std=c11 -DOBJPFX=\"$(objpfx)\" > +CFLAGS-tst-wscanf-binary-c23.c += -std=c11 -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-wscanf-binary-gnu11.c += -std=gnu11 -DOBJPFX=\"$(objpfx)\" > CFLAGS-tst-wscanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\" > diff --git a/wcsmbs/tst-wcstol-binary-c2x.c b/wcsmbs/tst-wcstol-binary-c23.c > similarity index 100% > rename from wcsmbs/tst-wcstol-binary-c2x.c > rename to wcsmbs/tst-wcstol-binary-c23.c > diff --git a/wcsmbs/tst-wcstol-binary-gnu2x.c b/wcsmbs/tst-wcstol-binary-gnu23.c > similarity index 100% > rename from wcsmbs/tst-wcstol-binary-gnu2x.c > rename to wcsmbs/tst-wcstol-binary-gnu23.c > diff --git a/wcsmbs/tst-wscanf-binary-c2x.c b/wcsmbs/tst-wscanf-binary-c23.c > similarity index 100% > rename from wcsmbs/tst-wscanf-binary-c2x.c > rename to wcsmbs/tst-wscanf-binary-c23.c >