Rename c2x / gnu2x tests to c23 / gnu23

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.
This commit is contained in:
Joseph Myers 2024-02-01 17:55:57 +00:00
parent c62b6265a6
commit 83d8d289b2
24 changed files with 38 additions and 38 deletions

View File

@ -240,7 +240,7 @@ tests := \
tst-renameat2 \ tst-renameat2 \
tst-rndseek \ tst-rndseek \
tst-scanf-binary-c11 \ tst-scanf-binary-c11 \
tst-scanf-binary-c2x \ tst-scanf-binary-c23 \
tst-scanf-binary-gnu11 \ tst-scanf-binary-gnu11 \
tst-scanf-binary-gnu89 \ tst-scanf-binary-gnu89 \
tst-scanf-intn \ 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 for that version uses -std=c11 and then _ISOC23_SOURCE is defined in
# the test as needed. # the test as needed.
CFLAGS-tst-scanf-binary-c11.c += -std=c11 -DOBJPFX=\"$(objpfx)\" 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-gnu11.c += -std=gnu11 -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-scanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-scanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\"

View File

@ -337,9 +337,9 @@ tests := \
tst-strtod6 \ tst-strtod6 \
tst-strtol \ tst-strtol \
tst-strtol-binary-c11 \ tst-strtol-binary-c11 \
tst-strtol-binary-c2x \ tst-strtol-binary-c23 \
tst-strtol-binary-gnu11 \ tst-strtol-binary-gnu11 \
tst-strtol-binary-gnu2x \ tst-strtol-binary-gnu23 \
tst-strtol-locale \ tst-strtol-locale \
tst-strtoll \ tst-strtoll \
tst-swapcontext1 \ 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 # (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. # and then _ISOC23_SOURCE is defined in the test as needed.
CFLAGS-tst-strtol-binary-c11.c += -std=c11 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-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. # Run a test on the header files we use.

View File

@ -346,11 +346,11 @@ endif
ifeq ($(subdir), stdio-common) ifeq ($(subdir), stdio-common)
tests += tst-ibm128-scanf-binary-c11 \ 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-gnu11 \
tst-ibm128-scanf-binary-gnu89 \ tst-ibm128-scanf-binary-gnu89 \
tst-ieee128-scanf-binary-c11 \ tst-ieee128-scanf-binary-c11 \
tst-ieee128-scanf-binary-c2x \ tst-ieee128-scanf-binary-c23 \
tst-ieee128-scanf-binary-gnu11 \ tst-ieee128-scanf-binary-gnu11 \
tst-ieee128-scanf-binary-gnu89 tst-ieee128-scanf-binary-gnu89
@ -360,7 +360,7 @@ tests += tst-ibm128-scanf-binary-c11 \
# the test as needed. # the test as needed.
CFLAGS-tst-ibm128-scanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \ CFLAGS-tst-ibm128-scanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \
-std=c11 -DOBJPFX=\"$(objpfx)\" -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)\" -std=c11 -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-ibm128-scanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \ CFLAGS-tst-ibm128-scanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \
-std=gnu11 -DOBJPFX=\"$(objpfx)\" -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 \ CFLAGS-tst-ieee128-scanf-binary-c11.c += -mfloat128 -mabi=ieeelongdouble \
-Wno-psabi -std=c11 \ -Wno-psabi -std=c11 \
-DOBJPFX=\"$(objpfx)\" -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 \ -Wno-psabi -std=c11 \
-DOBJPFX=\"$(objpfx)\" -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-ieee128-scanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \ CFLAGS-tst-ieee128-scanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \
@ -383,11 +383,11 @@ endif
ifeq ($(subdir), wcsmbs) ifeq ($(subdir), wcsmbs)
tests += tst-ibm128-wscanf-binary-c11 \ 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-gnu11 \
tst-ibm128-wscanf-binary-gnu89 \ tst-ibm128-wscanf-binary-gnu89 \
tst-ieee128-wscanf-binary-c11 \ tst-ieee128-wscanf-binary-c11 \
tst-ieee128-wscanf-binary-c2x \ tst-ieee128-wscanf-binary-c23 \
tst-ieee128-wscanf-binary-gnu11 \ tst-ieee128-wscanf-binary-gnu11 \
tst-ieee128-wscanf-binary-gnu89 tst-ieee128-wscanf-binary-gnu89
@ -397,7 +397,7 @@ tests += tst-ibm128-wscanf-binary-c11 \
# the test as needed. # the test as needed.
CFLAGS-tst-ibm128-wscanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \ CFLAGS-tst-ibm128-wscanf-binary-c11.c += -mabi=ibmlongdouble -Wno-psabi \
-std=c11 -DOBJPFX=\"$(objpfx)\" -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)\" -std=c11 -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-ibm128-wscanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \ CFLAGS-tst-ibm128-wscanf-binary-gnu11.c += -mabi=ibmlongdouble -Wno-psabi \
-std=gnu11 -DOBJPFX=\"$(objpfx)\" -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 \ CFLAGS-tst-ieee128-wscanf-binary-c11.c += -mfloat128 -mabi=ieeelongdouble \
-Wno-psabi -std=c11 \ -Wno-psabi -std=c11 \
-DOBJPFX=\"$(objpfx)\" -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 \ -Wno-psabi -std=c11 \
-DOBJPFX=\"$(objpfx)\" -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-ieee128-wscanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \ CFLAGS-tst-ieee128-wscanf-binary-gnu11.c += -mfloat128 -mabi=ieeelongdouble \

View File

@ -0,0 +1,2 @@
#define STDX "ibm128-"
#include <tst-scanf-binary-c23.c>

View File

@ -1,2 +0,0 @@
#define STDX "ibm128-"
#include <tst-scanf-binary-c2x.c>

View File

@ -0,0 +1,2 @@
#define STDX "ibm128-"
#include <tst-wscanf-binary-c23.c>

View File

@ -1,2 +0,0 @@
#define STDX "ibm128-"
#include <tst-wscanf-binary-c2x.c>

View File

@ -0,0 +1,2 @@
#define STDX "ieee128-"
#include <tst-scanf-binary-c23.c>

View File

@ -1,2 +0,0 @@
#define STDX "ieee128-"
#include <tst-scanf-binary-c2x.c>

View File

@ -0,0 +1,2 @@
#define STDX "ieee128-"
#include <tst-wscanf-binary-c23.c>

View File

@ -1,2 +0,0 @@
#define STDX "ieee128-"
#include <tst-wscanf-binary-c2x.c>

View File

@ -232,7 +232,7 @@ endif
ifeq ($(subdir), stdio-common) ifeq ($(subdir), stdio-common)
tests += tst-nldbl-scanf-binary-c11 \ 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-gnu11 \
tst-nldbl-scanf-binary-gnu89 tst-nldbl-scanf-binary-gnu89
@ -242,7 +242,7 @@ tests += tst-nldbl-scanf-binary-c11 \
# the test as needed. # the test as needed.
CFLAGS-tst-nldbl-scanf-binary-c11.c += -mlong-double-64 -std=c11 \ CFLAGS-tst-nldbl-scanf-binary-c11.c += -mlong-double-64 -std=c11 \
-DOBJPFX=\"$(objpfx)\" -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)\" -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-nldbl-scanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \ CFLAGS-tst-nldbl-scanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \
-DOBJPFX=\"$(objpfx)\" -DOBJPFX=\"$(objpfx)\"
@ -253,7 +253,7 @@ endif
ifeq ($(subdir), wcsmbs) ifeq ($(subdir), wcsmbs)
tests += tst-nldbl-wscanf-binary-c11 \ 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-gnu11 \
tst-nldbl-wscanf-binary-gnu89 tst-nldbl-wscanf-binary-gnu89
@ -263,7 +263,7 @@ tests += tst-nldbl-wscanf-binary-c11 \
# the test as needed. # the test as needed.
CFLAGS-tst-nldbl-wscanf-binary-c11.c += -mlong-double-64 -std=c11 \ CFLAGS-tst-nldbl-wscanf-binary-c11.c += -mlong-double-64 -std=c11 \
-DOBJPFX=\"$(objpfx)\" -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)\" -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-nldbl-wscanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \ CFLAGS-tst-nldbl-wscanf-binary-gnu11.c += -mlong-double-64 -std=gnu11 \
-DOBJPFX=\"$(objpfx)\" -DOBJPFX=\"$(objpfx)\"

View File

@ -0,0 +1,2 @@
#define STDX "nldbl-"
#include <tst-scanf-binary-c23.c>

View File

@ -1,2 +0,0 @@
#define STDX "nldbl-"
#include <tst-scanf-binary-c2x.c>

View File

@ -0,0 +1,2 @@
#define STDX "nldbl-"
#include <tst-wscanf-binary-c23.c>

View File

@ -1,2 +0,0 @@
#define STDX "nldbl-"
#include <tst-wscanf-binary-c2x.c>

View File

@ -161,7 +161,7 @@ CFLAGS-printf_size.c = $(type-float128-CFLAGS)
#Older GCC (<10) doesn't like -mabi=ieeelongdouble and -mlong-double-64. #Older GCC (<10) doesn't like -mabi=ieeelongdouble and -mlong-double-64.
$(foreach suf,$(all-object-suffixes),\ $(foreach suf,$(all-object-suffixes),\
$(objpfx)tst-nldbl-scanf-binary-c11$(suf) \ $(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-gnu11$(suf) \
$(objpfx)tst-nldbl-scanf-binary-gnu89$(suf) \ $(objpfx)tst-nldbl-scanf-binary-gnu89$(suf) \
): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS))
@ -171,7 +171,7 @@ endif
ifeq ($(subdir), wcsmbs) ifeq ($(subdir), wcsmbs)
$(foreach suf,$(all-object-suffixes),\ $(foreach suf,$(all-object-suffixes),\
$(objpfx)tst-nldbl-wscanf-binary-c11$(suf) \ $(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-gnu11$(suf) \
$(objpfx)tst-nldbl-wscanf-binary-gnu89$(suf) \ $(objpfx)tst-nldbl-wscanf-binary-gnu89$(suf) \
): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS)) ): sysdep-CFLAGS := $(filter-out -mabi=ieeelongdouble,$(sysdep-CFLAGS))

View File

@ -188,14 +188,14 @@ tests := \
tst-wcstod-round \ tst-wcstod-round \
tst-wcstof \ tst-wcstof \
tst-wcstol-binary-c11 \ tst-wcstol-binary-c11 \
tst-wcstol-binary-c2x \ tst-wcstol-binary-c23 \
tst-wcstol-binary-gnu11 \ tst-wcstol-binary-gnu11 \
tst-wcstol-binary-gnu2x \ tst-wcstol-binary-gnu23 \
tst-wcstol-locale \ tst-wcstol-locale \
tst-wprintf-binary \ tst-wprintf-binary \
tst-wprintf-intn \ tst-wprintf-intn \
tst-wscanf-binary-c11 \ tst-wscanf-binary-c11 \
tst-wscanf-binary-c2x \ tst-wscanf-binary-c23 \
tst-wscanf-binary-gnu11 \ tst-wscanf-binary-gnu11 \
tst-wscanf-binary-gnu89 \ tst-wscanf-binary-gnu89 \
tst-wscanf-intn \ 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 # (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. # and then _ISOC23_SOURCE is defined in the test as needed.
CFLAGS-tst-wcstol-binary-c11.c += -std=c11 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-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-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-gnu11.c += -std=gnu11 -DOBJPFX=\"$(objpfx)\"
CFLAGS-tst-wscanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\" CFLAGS-tst-wscanf-binary-gnu89.c += -std=gnu89 -DOBJPFX=\"$(objpfx)\"