From 83d8d289b295406e30bc8a079286b093d552c3a5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 1 Feb 2024 17:55:57 +0000 Subject: 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. --- stdio-common/Makefile | 4 +-- stdio-common/tst-scanf-binary-c23.c | 31 ++++++++++++++++++++ stdio-common/tst-scanf-binary-c2x.c | 31 -------------------- stdlib/Makefile | 8 +++--- stdlib/tst-strtol-binary-c23.c | 33 ++++++++++++++++++++++ stdlib/tst-strtol-binary-c2x.c | 33 ---------------------- stdlib/tst-strtol-binary-gnu23.c | 28 ++++++++++++++++++ stdlib/tst-strtol-binary-gnu2x.c | 28 ------------------ sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 16 +++++------ .../tst-ibm128-scanf-binary-c23.c | 2 ++ .../tst-ibm128-scanf-binary-c2x.c | 2 -- .../tst-ibm128-wscanf-binary-c23.c | 2 ++ .../tst-ibm128-wscanf-binary-c2x.c | 2 -- .../tst-ieee128-scanf-binary-c23.c | 2 ++ .../tst-ieee128-scanf-binary-c2x.c | 2 -- .../tst-ieee128-wscanf-binary-c23.c | 2 ++ .../tst-ieee128-wscanf-binary-c2x.c | 2 -- sysdeps/ieee754/ldbl-opt/Makefile | 8 +++--- .../ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c | 2 ++ .../ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c | 2 -- .../ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c | 2 ++ .../ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c | 2 -- sysdeps/powerpc/powerpc64/le/Makefile | 4 +-- wcsmbs/Makefile | 12 ++++---- wcsmbs/tst-wcstol-binary-c23.c | 33 ++++++++++++++++++++++ wcsmbs/tst-wcstol-binary-c2x.c | 33 ---------------------- wcsmbs/tst-wcstol-binary-gnu23.c | 28 ++++++++++++++++++ wcsmbs/tst-wcstol-binary-gnu2x.c | 28 ------------------ wcsmbs/tst-wscanf-binary-c23.c | 31 ++++++++++++++++++++ wcsmbs/tst-wscanf-binary-c2x.c | 31 -------------------- 30 files changed, 222 insertions(+), 222 deletions(-) create mode 100644 stdio-common/tst-scanf-binary-c23.c delete mode 100644 stdio-common/tst-scanf-binary-c2x.c create mode 100644 stdlib/tst-strtol-binary-c23.c delete mode 100644 stdlib/tst-strtol-binary-c2x.c create mode 100644 stdlib/tst-strtol-binary-gnu23.c delete mode 100644 stdlib/tst-strtol-binary-gnu2x.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c23.c delete mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-scanf-binary-c2x.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c23.c delete mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ibm128-wscanf-binary-c2x.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c23.c delete mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-scanf-binary-c2x.c create mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c23.c delete mode 100644 sysdeps/ieee754/ldbl-128ibm-compat/tst-ieee128-wscanf-binary-c2x.c create mode 100644 sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c23.c delete mode 100644 sysdeps/ieee754/ldbl-opt/tst-nldbl-scanf-binary-c2x.c create mode 100644 sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c23.c delete mode 100644 sysdeps/ieee754/ldbl-opt/tst-nldbl-wscanf-binary-c2x.c create mode 100644 wcsmbs/tst-wcstol-binary-c23.c delete mode 100644 wcsmbs/tst-wcstol-binary-c2x.c create mode 100644 wcsmbs/tst-wcstol-binary-gnu23.c delete mode 100644 wcsmbs/tst-wcstol-binary-gnu2x.c create mode 100644 wcsmbs/tst-wscanf-binary-c23.c delete mode 100644 wcsmbs/tst-wscanf-binary-c2x.c diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 60a7f4c..6447b6b 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-c23.c b/stdio-common/tst-scanf-binary-c23.c new file mode 100644 index 0000000..ebb9f04 --- /dev/null +++ b/stdio-common/tst-scanf-binary-c23.c @@ -0,0 +1,31 @@ +/* Test scanf functions with C23 binary integers (narrow strings, + no extensions). + Copyright (C) 2022-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Some versions of GCC supported for building glibc do not support + -std=c23 or -std=c2x. */ +#undef _GNU_SOURCE +#define _ISOC23_SOURCE + +#define CHAR char +#define FNW +#define L_(C) C +#define TEST_C23 1 +#define STD "c23" + +#include diff --git a/stdio-common/tst-scanf-binary-c2x.c b/stdio-common/tst-scanf-binary-c2x.c deleted file mode 100644 index ebb9f04..0000000 --- a/stdio-common/tst-scanf-binary-c2x.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Test scanf functions with C23 binary integers (narrow strings, - no extensions). - Copyright (C) 2022-2024 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* Some versions of GCC supported for building glibc do not support - -std=c23 or -std=c2x. */ -#undef _GNU_SOURCE -#define _ISOC23_SOURCE - -#define CHAR char -#define FNW -#define L_(C) C -#define TEST_C23 1 -#define STD "c23" - -#include diff --git a/stdlib/Makefile b/stdlib/Makefile index e9f9c78..8b0ac63 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-c23.c b/stdlib/tst-strtol-binary-c23.c new file mode 100644 index 0000000..5e2b6dd --- /dev/null +++ b/stdlib/tst-strtol-binary-c23.c @@ -0,0 +1,33 @@ +/* Test strtol functions with C23 binary integers (narrow strings, + no extensions). + Copyright (C) 2022-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Some versions of GCC supported for building glibc do not support + -std=c23 or -std=c2x. */ +#undef _GNU_SOURCE +#define _ISOC23_SOURCE + +#define CHAR char +#define WIDE 0 +#define FNPFX strto +#define L_(C) C +#define TEST_C23 1 +#define TEST_Q 0 +#define TEST_LOCALE 0 + +#include diff --git a/stdlib/tst-strtol-binary-c2x.c b/stdlib/tst-strtol-binary-c2x.c deleted file mode 100644 index 5e2b6dd..0000000 --- a/stdlib/tst-strtol-binary-c2x.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Test strtol functions with C23 binary integers (narrow strings, - no extensions). - Copyright (C) 2022-2024 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* Some versions of GCC supported for building glibc do not support - -std=c23 or -std=c2x. */ -#undef _GNU_SOURCE -#define _ISOC23_SOURCE - -#define CHAR char -#define WIDE 0 -#define FNPFX strto -#define L_(C) C -#define TEST_C23 1 -#define TEST_Q 0 -#define TEST_LOCALE 0 - -#include diff --git a/stdlib/tst-strtol-binary-gnu23.c b/stdlib/tst-strtol-binary-gnu23.c new file mode 100644 index 0000000..7732025 --- /dev/null +++ b/stdlib/tst-strtol-binary-gnu23.c @@ -0,0 +1,28 @@ +/* Test strtol functions with C23 binary integers (narrow strings, GNU + extensions). + Copyright (C) 2022-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define CHAR char +#define WIDE 0 +#define FNPFX strto +#define L_(C) C +#define TEST_C23 1 +#define TEST_Q 1 +#define TEST_LOCALE 1 + +#include diff --git a/stdlib/tst-strtol-binary-gnu2x.c b/stdlib/tst-strtol-binary-gnu2x.c deleted file mode 100644 index 7732025..0000000 --- a/stdlib/tst-strtol-binary-gnu2x.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Test strtol functions with C23 binary integers (narrow strings, GNU - extensions). - Copyright (C) 2022-2024 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#define CHAR char -#define WIDE 0 -#define FNPFX strto -#define L_(C) C -#define TEST_C23 1 -#define TEST_Q 1 -#define TEST_LOCALE 1 - -#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 20cb2db..910c019 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 0000000..982d335 --- /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 f8bb2e4..0000000 --- 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 0000000..594afd5 --- /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 bf0c3da..0000000 --- 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 0000000..ce25ef0 --- /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 d09c213..0000000 --- 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 0000000..c0b5233 --- /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 7e2d27c..0000000 --- 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 f20c267..74788ac 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 0000000..f30d950 --- /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 4e0cf75..0000000 --- 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 0000000..0fd6127 --- /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 7637aab..0000000 --- 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 5214eb4..9d568d4 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 b64a5e1..f3333c6 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-c23.c b/wcsmbs/tst-wcstol-binary-c23.c new file mode 100644 index 0000000..1d7f90f --- /dev/null +++ b/wcsmbs/tst-wcstol-binary-c23.c @@ -0,0 +1,33 @@ +/* Test wcstol functions with C23 binary integers (wide strings, + no extensions). + Copyright (C) 2022-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Some versions of GCC supported for building glibc do not support + -std=c23 or -std-c2x. */ +#undef _GNU_SOURCE +#define _ISOC23_SOURCE + +#define CHAR wchar_t +#define WIDE 1 +#define FNPFX wcsto +#define L_(C) L ## C +#define TEST_C23 1 +#define TEST_Q 0 +#define TEST_LOCALE 0 + +#include "../stdlib/tst-strtol-binary-main.c" diff --git a/wcsmbs/tst-wcstol-binary-c2x.c b/wcsmbs/tst-wcstol-binary-c2x.c deleted file mode 100644 index 1d7f90f..0000000 --- a/wcsmbs/tst-wcstol-binary-c2x.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Test wcstol functions with C23 binary integers (wide strings, - no extensions). - Copyright (C) 2022-2024 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* Some versions of GCC supported for building glibc do not support - -std=c23 or -std-c2x. */ -#undef _GNU_SOURCE -#define _ISOC23_SOURCE - -#define CHAR wchar_t -#define WIDE 1 -#define FNPFX wcsto -#define L_(C) L ## C -#define TEST_C23 1 -#define TEST_Q 0 -#define TEST_LOCALE 0 - -#include "../stdlib/tst-strtol-binary-main.c" diff --git a/wcsmbs/tst-wcstol-binary-gnu23.c b/wcsmbs/tst-wcstol-binary-gnu23.c new file mode 100644 index 0000000..7bd7c0d --- /dev/null +++ b/wcsmbs/tst-wcstol-binary-gnu23.c @@ -0,0 +1,28 @@ +/* Test wcstol functions with C23 binary integers (wide strings, GNU + extensions). + Copyright (C) 2022-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define CHAR wchar_t +#define WIDE 1 +#define FNPFX wcsto +#define L_(C) L ## C +#define TEST_C23 1 +#define TEST_Q 1 +#define TEST_LOCALE 1 + +#include "../stdlib/tst-strtol-binary-main.c" diff --git a/wcsmbs/tst-wcstol-binary-gnu2x.c b/wcsmbs/tst-wcstol-binary-gnu2x.c deleted file mode 100644 index 7bd7c0d..0000000 --- a/wcsmbs/tst-wcstol-binary-gnu2x.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Test wcstol functions with C23 binary integers (wide strings, GNU - extensions). - Copyright (C) 2022-2024 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#define CHAR wchar_t -#define WIDE 1 -#define FNPFX wcsto -#define L_(C) L ## C -#define TEST_C23 1 -#define TEST_Q 1 -#define TEST_LOCALE 1 - -#include "../stdlib/tst-strtol-binary-main.c" diff --git a/wcsmbs/tst-wscanf-binary-c23.c b/wcsmbs/tst-wscanf-binary-c23.c new file mode 100644 index 0000000..06d99f2 --- /dev/null +++ b/wcsmbs/tst-wscanf-binary-c23.c @@ -0,0 +1,31 @@ +/* Test wscanf functions with C23 binary integers (wide strings, + no extensions). + Copyright (C) 2022-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Some versions of GCC supported for building glibc do not support + -std=c23 or -std=c2x. */ +#undef _GNU_SOURCE +#define _ISOC23_SOURCE + +#define CHAR wchar_t +#define FNW w +#define L_(C) L ## C +#define TEST_C23 1 +#define STD "c23" + +#include "../stdio-common/tst-scanf-binary-main.c" diff --git a/wcsmbs/tst-wscanf-binary-c2x.c b/wcsmbs/tst-wscanf-binary-c2x.c deleted file mode 100644 index 06d99f2..0000000 --- a/wcsmbs/tst-wscanf-binary-c2x.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Test wscanf functions with C23 binary integers (wide strings, - no extensions). - Copyright (C) 2022-2024 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* Some versions of GCC supported for building glibc do not support - -std=c23 or -std=c2x. */ -#undef _GNU_SOURCE -#define _ISOC23_SOURCE - -#define CHAR wchar_t -#define FNW w -#define L_(C) L ## C -#define TEST_C23 1 -#define STD "c23" - -#include "../stdio-common/tst-scanf-binary-main.c" -- cgit v1.1