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.

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 60a7f4cff3a4a004b5efaf711cefb5ee9fa8b97a..6447b6b4441d80413b38e999c378a6f7783efcf6 100644 (file)
--- 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 e9f9c7856dcb38cf54a6878be61301a8ebaac90c..8b0ac63ddb3e17472fde05dae34979c1d6d835ef 100644 (file)
--- 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 20cb2dbe3546a20f3a73e95777cd03f3fdb39931..910c0198eb8be707190c5a7a56418241c5f82942 100644 (file)
--- 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 (file)
index 0000000..982d335
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c
@@ -0,0 +1,2 @@
+#define STDX "ibm128-"
+#include <tst-scanf-binary-c23.c>

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 (file)
index f8bb2e4..0000000
--- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STDX "ibm128-"
-#include <tst-scanf-binary-c2x.c>

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 (file)
index 0000000..594afd5
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c
@@ -0,0 +1,2 @@
+#define STDX "ibm128-"
+#include <tst-wscanf-binary-c23.c>

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 (file)
index bf0c3da..0000000
--- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STDX "ibm128-"
-#include <tst-wscanf-binary-c2x.c>

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 (file)
index 0000000..ce25ef0
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c
@@ -0,0 +1,2 @@
+#define STDX "ieee128-"
+#include <tst-scanf-binary-c23.c>

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 (file)
index d09c213..0000000
--- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STDX "ieee128-"
-#include <tst-scanf-binary-c2x.c>

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 (file)
index 0000000..c0b5233
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c
@@ -0,0 +1,2 @@
+#define STDX "ieee128-"
+#include <tst-wscanf-binary-c23.c>

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 (file)
index 7e2d27c..0000000
--- a/sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STDX "ieee128-"
-#include <tst-wscanf-binary-c2x.c>

diff --git a/sysdeps/ieee754/ldbl-opt/Makefile b/sysdeps/ieee754/ldbl-opt/Makefile
index f20c267081750f0d0a8f475f4af68a694112a49d..74788ac9996c74bf3a5284c764478955b0d228b7 100644 (file)
--- 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 (file)
index 0000000..f30d950
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c
@@ -0,0 +1,2 @@
+#define STDX "nldbl-"
+#include <tst-scanf-binary-c23.c>

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 (file)
index 4e0cf75..0000000
--- a/sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STDX "nldbl-"
-#include <tst-scanf-binary-c2x.c>

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 (file)
index 0000000..0fd6127
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c
@@ -0,0 +1,2 @@
+#define STDX "nldbl-"
+#include <tst-wscanf-binary-c23.c>

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 (file)
index 7637aab..0000000
--- a/sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define STDX "nldbl-"
-#include <tst-wscanf-binary-c2x.c>

diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile
index 5214eb40adbdf25dc145a31278e3c5750b3f3f3d..9d568d4f442300e1cc6c7a159333180c4c582724 100644 (file)
--- 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 b64a5e1ce5d7d73e7a4ba3cd9c3afe939dc71159..f3333c6a4b748f8412add4caaf04e69e14264772 100644 (file)
--- 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