testsuite: Refer more consistently to C23 not C2X

Continuing the move to refer to C23 in place of C2X throughout the source tree, update testcase contents to use the "c23" or "gnu23" option names in place of the old "c2x" or "gnu2x" names, except for the few tests specifically intended to test the old names, and to refer to C23 in comments. This updates testcase *contents*; testcase naming (renaming c2x-* tests to c23-* and gnu2x-* tests to gnu23-*), with a few consequent changes to contents (where tests #include other tests, or refer to them by name in comments) is to be addressed separately. Bootstrapped with no regressions for x86_64-pc-linux-gnu. gcc/testsuite/ * c-c++-common/alias-1.c: Use "c23" or "gnu23" option names in place of "c2x" or "gnu2x" names, and refer to C23 in comments in place of C2X or C2x. * gcc.dg/Wformat-overflow1.c: Likewise. * gcc.dg/asm-scope-1.c: Likewise. * gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c: Likewise. * gcc.dg/atomic/c2x-stdatomic-var-init-1.c: Likewise. * gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c: Likewise. * gcc.dg/atomic/stdatomic-bitint-1.c: Likewise. * gcc.dg/atomic/stdatomic-bitint-2.c: Likewise. * gcc.dg/attr-assume-1.c: Likewise. * gcc.dg/attr-assume-2.c: Likewise. * gcc.dg/attr-assume-3.c: Likewise. * gcc.dg/attr-assume-4.c: Likewise. * gcc.dg/bitint-1.c: Likewise. * gcc.dg/bitint-10.c: Likewise. * gcc.dg/bitint-11.c: Likewise. * gcc.dg/bitint-12.c: Likewise. * gcc.dg/bitint-13.c: Likewise. * gcc.dg/bitint-14.c: Likewise. * gcc.dg/bitint-15.c: Likewise. * gcc.dg/bitint-16.c: Likewise. * gcc.dg/bitint-17.c: Likewise. * gcc.dg/bitint-18.c: Likewise. * gcc.dg/bitint-19.c: Likewise. * gcc.dg/bitint-2.c: Likewise. * gcc.dg/bitint-20.c: Likewise. * gcc.dg/bitint-21.c: Likewise. * gcc.dg/bitint-22.c: Likewise. * gcc.dg/bitint-23.c: Likewise. * gcc.dg/bitint-25.c: Likewise. * gcc.dg/bitint-28.c: Likewise. * gcc.dg/bitint-29.c: Likewise. * gcc.dg/bitint-3.c: Likewise. * gcc.dg/bitint-30.c: Likewise. * gcc.dg/bitint-31.c: Likewise. * gcc.dg/bitint-32.c: Likewise. * gcc.dg/bitint-34.c: Likewise. * gcc.dg/bitint-35.c: Likewise. * gcc.dg/bitint-36.c: Likewise. * gcc.dg/bitint-38.c: Likewise. * gcc.dg/bitint-39.c: Likewise. * gcc.dg/bitint-4.c: Likewise. * gcc.dg/bitint-5.c: Likewise. * gcc.dg/bitint-6.c: Likewise. * gcc.dg/bitint-7.c: Likewise. * gcc.dg/bitint-8.c: Likewise. * gcc.dg/bitint-9.c: Likewise. * gcc.dg/c11-attr-syntax-3.c: Likewise. * gcc.dg/c11-builtins-1.c: Likewise. * gcc.dg/c11-complit-1.c: Likewise. * gcc.dg/c11-complit-2.c: Likewise. * gcc.dg/c11-complit-3.c: Likewise. * gcc.dg/c11-digit-separators-1.c: Likewise. * gcc.dg/c11-empty-init-3.c: Likewise. * gcc.dg/c11-enum-1.c: Likewise. * gcc.dg/c11-enum-2.c: Likewise. * gcc.dg/c11-enum-3.c: Likewise. * gcc.dg/c11-enum-4.c: Likewise. * gcc.dg/c11-enum-5.c: Likewise. * gcc.dg/c11-enum-6.c: Likewise. * gcc.dg/c11-floatn-5.c: Likewise. * gcc.dg/c11-floatn-6.c: Likewise. * gcc.dg/c11-floatn-7.c: Likewise. * gcc.dg/c11-floatn-8.c: Likewise. * gcc.dg/c11-fordecl-3.c: Likewise. * gcc.dg/c11-fordecl-4.c: Likewise. * gcc.dg/c11-keywords-1.c: Likewise. * gcc.dg/c11-old-style-definition-1.c: Likewise. * gcc.dg/c11-old-style-definition-2.c: Likewise. * gcc.dg/c11-parm-omit-3.c: Likewise. * gcc.dg/c11-qual-1.c: Likewise. * gcc.dg/c11-static-assert-9.c: Likewise. * gcc.dg/c11-stdarg-3.c: Likewise. * gcc.dg/c11-unproto-1.c: Likewise. * gcc.dg/c11-unproto-2.c: Likewise. * gcc.dg/c11-utf8char-1.c: Likewise. * gcc.dg/c17-nullptr-2.c: Likewise. * gcc.dg/c2x-align-1.c: Likewise. * gcc.dg/c2x-align-6.c: Likewise. * gcc.dg/c2x-attr-deprecated-1.c: Likewise. * gcc.dg/c2x-attr-deprecated-2.c: Likewise. * gcc.dg/c2x-attr-deprecated-3.c: Likewise. * gcc.dg/c2x-attr-deprecated-4.c: Likewise. * gcc.dg/c2x-attr-fallthrough-1.c: Likewise. * gcc.dg/c2x-attr-fallthrough-2.c: Likewise. * gcc.dg/c2x-attr-fallthrough-3.c: Likewise. * gcc.dg/c2x-attr-fallthrough-4.c: Likewise. * gcc.dg/c2x-attr-fallthrough-5.c: Likewise. * gcc.dg/c2x-attr-fallthrough-6.c: Likewise. * gcc.dg/c2x-attr-maybe_unused-1.c: Likewise. * gcc.dg/c2x-attr-maybe_unused-2.c: Likewise. * gcc.dg/c2x-attr-maybe_unused-3.c: Likewise. * gcc.dg/c2x-attr-maybe_unused-4.c: Likewise. * gcc.dg/c2x-attr-nodiscard-1.c: Likewise. * gcc.dg/c2x-attr-nodiscard-2.c: Likewise. * gcc.dg/c2x-attr-nodiscard-3.c: Likewise. * gcc.dg/c2x-attr-nodiscard-4.c: Likewise. * gcc.dg/c2x-attr-noreturn-1.c: Likewise. * gcc.dg/c2x-attr-noreturn-2.c: Likewise. * gcc.dg/c2x-attr-noreturn-3.c: Likewise. * gcc.dg/c2x-attr-syntax-1.c: Likewise. * gcc.dg/c2x-attr-syntax-2.c: Likewise. * gcc.dg/c2x-attr-syntax-3.c: Likewise. * gcc.dg/c2x-attr-syntax-4.c: Likewise. * gcc.dg/c2x-attr-syntax-5.c: Likewise. * gcc.dg/c2x-attr-syntax-7.c: Likewise. * gcc.dg/c2x-auto-1.c: Likewise. * gcc.dg/c2x-auto-2.c: Likewise. * gcc.dg/c2x-auto-3.c: Likewise. * gcc.dg/c2x-auto-4.c: Likewise. * gcc.dg/c2x-binary-constants-1.c: Likewise. * gcc.dg/c2x-binary-constants-2.c: Likewise. * gcc.dg/c2x-binary-constants-3.c: Likewise. * gcc.dg/c2x-bool-1.c: Likewise. * gcc.dg/c2x-bool-2.c: Likewise. * gcc.dg/c2x-bool-limits-1.c: Likewise. * gcc.dg/c2x-builtins-1.c: Likewise. * gcc.dg/c2x-complit-1.c: Likewise. * gcc.dg/c2x-complit-2.c: Likewise. * gcc.dg/c2x-complit-3.c: Likewise. * gcc.dg/c2x-complit-4.c: Likewise. * gcc.dg/c2x-complit-5.c: Likewise. * gcc.dg/c2x-complit-6.c: Likewise. * gcc.dg/c2x-complit-7.c: Likewise. * gcc.dg/c2x-complit-8.c: Likewise. * gcc.dg/c2x-concat-1.c: Likewise. * gcc.dg/c2x-constexpr-1.c: Likewise. * gcc.dg/c2x-constexpr-2a.c: Likewise. * gcc.dg/c2x-constexpr-2b.c: Likewise. * gcc.dg/c2x-constexpr-3.c: Likewise. * gcc.dg/c2x-constexpr-4.c: Likewise. * gcc.dg/c2x-constexpr-5.c: Likewise. * gcc.dg/c2x-constexpr-6.c: Likewise. * gcc.dg/c2x-constexpr-7.c: Likewise. * gcc.dg/c2x-constexpr-8.c: Likewise. * gcc.dg/c2x-constexpr-9.c: Likewise. * gcc.dg/c2x-digit-separators-1.c: Likewise. * gcc.dg/c2x-digit-separators-2.c: Likewise. * gcc.dg/c2x-digit-separators-3.c: Likewise. * gcc.dg/c2x-empty-init-1.c: Likewise. * gcc.dg/c2x-empty-init-2.c: Likewise. * gcc.dg/c2x-empty-init-3.c: Likewise. * gcc.dg/c2x-enum-1.c: Likewise. * gcc.dg/c2x-enum-2.c: Likewise. * gcc.dg/c2x-enum-3.c: Likewise. * gcc.dg/c2x-enum-4.c: Likewise. * gcc.dg/c2x-enum-5.c: Likewise. * gcc.dg/c2x-enum-6.c: Likewise. * gcc.dg/c2x-enum-7.c: Likewise. * gcc.dg/c2x-enum-8.c: Likewise. * gcc.dg/c2x-float-1.c: Likewise. * gcc.dg/c2x-float-10.c: Likewise. * gcc.dg/c2x-float-11.c: Likewise. * gcc.dg/c2x-float-12.c: Likewise. * gcc.dg/c2x-float-13.c: Likewise. * gcc.dg/c2x-float-2.c: Likewise. * gcc.dg/c2x-float-3.c: Likewise. * gcc.dg/c2x-float-4.c: Likewise. * gcc.dg/c2x-float-5.c: Likewise. * gcc.dg/c2x-float-6.c: Likewise. * gcc.dg/c2x-float-7a.c: Likewise. * gcc.dg/c2x-float-7b.c: Likewise. * gcc.dg/c2x-float-7c.c: Likewise. * gcc.dg/c2x-float-8.c: Likewise. * gcc.dg/c2x-float-9.c: Likewise. * gcc.dg/c2x-float-no-dfp-1.c: Likewise. * gcc.dg/c2x-float-no-dfp-2.c: Likewise. * gcc.dg/c2x-float-no-dfp-3.c: Likewise. * gcc.dg/c2x-float-no-dfp-4.c: Likewise. * gcc.dg/c2x-floatn-1.c: Likewise. * gcc.dg/c2x-floatn-2.c: Likewise. * gcc.dg/c2x-floatn-3.c: Likewise. * gcc.dg/c2x-floatn-4.c: Likewise. * gcc.dg/c2x-floatn-5.c: Likewise. * gcc.dg/c2x-floatn-6.c: Likewise. * gcc.dg/c2x-floatn-7.c: Likewise. * gcc.dg/c2x-floatn-8.c: Likewise. * gcc.dg/c2x-fordecl-1.c: Likewise. * gcc.dg/c2x-fordecl-2.c: Likewise. * gcc.dg/c2x-fordecl-3.c: Likewise. * gcc.dg/c2x-fordecl-4.c: Likewise. * gcc.dg/c2x-has-c-attribute-1.c: Likewise. * gcc.dg/c2x-has-c-attribute-2.c: Likewise. * gcc.dg/c2x-has-c-attribute-3.c: Likewise. * gcc.dg/c2x-has-c-attribute-4.c: Likewise. * gcc.dg/c2x-labels-1.c: Likewise. * gcc.dg/c2x-labels-2.c: Likewise. * gcc.dg/c2x-labels-3.c: Likewise. * gcc.dg/c2x-limits-1.c: Likewise. * gcc.dg/c2x-no-dfp-1.c: Likewise. * gcc.dg/c2x-nullptr-1.c: Likewise. * gcc.dg/c2x-nullptr-2.c: Likewise. * gcc.dg/c2x-nullptr-3.c: Likewise. * gcc.dg/c2x-nullptr-4.c: Likewise. * gcc.dg/c2x-nullptr-5.c: Likewise. * gcc.dg/c2x-nullptr-6.c: Likewise. * gcc.dg/c2x-old-style-definition-1.c: Likewise. * gcc.dg/c2x-old-style-definition-2.c: Likewise. * gcc.dg/c2x-old-style-definition-3.c: Likewise. * gcc.dg/c2x-old-style-definition-4.c: Likewise. * gcc.dg/c2x-old-style-definition-5.c: Likewise. * gcc.dg/c2x-old-style-definition-6.c: Likewise. * gcc.dg/c2x-parm-omit-1.c: Likewise. * gcc.dg/c2x-parm-omit-2.c: Likewise. * gcc.dg/c2x-parm-omit-3.c: Likewise. * gcc.dg/c2x-parm-omit-4.c: Likewise. * gcc.dg/c2x-qual-1.c: Likewise. * gcc.dg/c2x-qual-2.c: Likewise. * gcc.dg/c2x-qual-3.c: Likewise. * gcc.dg/c2x-qual-4.c: Likewise. * gcc.dg/c2x-qual-5.c: Likewise. * gcc.dg/c2x-qual-6.c: Likewise. * gcc.dg/c2x-qual-7.c: Likewise. * gcc.dg/c2x-static-assert-1.c: Likewise. * gcc.dg/c2x-static-assert-2.c: Likewise. * gcc.dg/c2x-static-assert-3.c: Likewise. * gcc.dg/c2x-static-assert-4.c: Likewise. * gcc.dg/c2x-stdarg-1.c: Likewise. * gcc.dg/c2x-stdarg-2.c: Likewise. * gcc.dg/c2x-stdarg-3.c: Likewise. * gcc.dg/c2x-stdarg-4.c: Likewise. * gcc.dg/c2x-stdarg-5.c: Likewise. * gcc.dg/c2x-stdatomic-1.c: Likewise. * gcc.dg/c2x-stddef-1.c: Likewise. * gcc.dg/c2x-stdint-1.c: Likewise. * gcc.dg/c2x-thread-local-1.c: Likewise. * gcc.dg/c2x-thread-local-2.c: Likewise. * gcc.dg/c2x-typeof-1.c: Likewise. * gcc.dg/c2x-typeof-2.c: Likewise. * gcc.dg/c2x-typeof-3.c: Likewise. * gcc.dg/c2x-unproto-1.c: Likewise. * gcc.dg/c2x-unproto-2.c: Likewise. * gcc.dg/c2x-unproto-3.c: Likewise. * gcc.dg/c2x-unproto-4.c: Likewise. * gcc.dg/c2x-unreachable-1.c: Likewise. * gcc.dg/c2x-utf8char-1.c: Likewise. * gcc.dg/c2x-utf8char-2.c: Likewise. * gcc.dg/c2x-utf8char-3.c: Likewise. * gcc.dg/c2x-utf8str-type.c: Likewise. * gcc.dg/c2x-utf8str.c: Likewise. * gcc.dg/c90-auto-1.c: Likewise. * gcc.dg/c90-complit-2.c: Likewise. * gcc.dg/cpp/c11-warning-3.c: Likewise. * gcc.dg/cpp/c2x-elifdef-1.c: Likewise. * gcc.dg/cpp/c2x-elifdef-2.c: Likewise. * gcc.dg/cpp/c2x-scope-1.c: Likewise. * gcc.dg/cpp/c2x-scope-2.c: Likewise. * gcc.dg/cpp/c2x-trigraphs-1.c: Likewise. * gcc.dg/cpp/c2x-trigraphs-2.c: Likewise. * gcc.dg/cpp/c2x-ucn-1.c: Likewise. * gcc.dg/cpp/c2x-ucnid-1-utf8.c: Likewise. * gcc.dg/cpp/c2x-ucnid-1.c: Likewise. * gcc.dg/cpp/c2x-va-opt-1.c: Likewise. * gcc.dg/cpp/c2x-warning-1.c: Likewise. * gcc.dg/cpp/c2x-warning-2.c: Likewise. * gcc.dg/cpp/gnu11-warning-3.c: Likewise. * gcc.dg/cpp/gnu2x-warning-1.c: Likewise. * gcc.dg/cpp/gnu2x-warning-2.c: Likewise. * gcc.dg/cr-decimal-dig-2.c: Likewise. * gcc.dg/cr-decimal-dig-3.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d128-1.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d128-2.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d128-3.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d128-4.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d32-1.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d32-2.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d64-1.c: Likewise. * gcc.dg/dfp/bid-non-canonical-d64-2.c: Likewise. * gcc.dg/dfp/bitint-1.c: Likewise. * gcc.dg/dfp/bitint-2.c: Likewise. * gcc.dg/dfp/bitint-3.c: Likewise. * gcc.dg/dfp/bitint-4.c: Likewise. * gcc.dg/dfp/bitint-5.c: Likewise. * gcc.dg/dfp/bitint-6.c: Likewise. * gcc.dg/dfp/bitint-7.c: Likewise. * gcc.dg/dfp/bitint-8.c: Likewise. * gcc.dg/dfp/c2x-builtins-dfp-1.c: Likewise. * gcc.dg/dfp/c2x-constants-1.c: Likewise. * gcc.dg/dfp/c2x-constants-2.c: Likewise. * gcc.dg/dfp/c2x-constexpr-dfp-1.c: Likewise. * gcc.dg/dfp/c2x-constexpr-dfp-2.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-1.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-2.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-3.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-4.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-5.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-6.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-7.c: Likewise. * gcc.dg/dfp/c2x-float-dfp-8.c: Likewise. * gcc.dg/dfp/c2x-keywords-1.c: Likewise. * gcc.dg/dfp/c2x-keywords-2.c: Likewise. * gcc.dg/dfp/tr24732-float-dfp-1.c: Likewise. * gcc.dg/dfp/ts18661-2-float-dfp-1.c: Likewise. * gcc.dg/fixed-point/bitint-1.c: Likewise. * gcc.dg/format/c11-printf-1.c: Likewise. * gcc.dg/format/c11-scanf-1.c: Likewise. * gcc.dg/format/c2x-dfp-printf-1.c: Likewise. * gcc.dg/format/c2x-dfp-scanf-1.c: Likewise. * gcc.dg/format/c2x-printf-1.c: Likewise. * gcc.dg/format/c2x-scanf-1.c: Likewise. * gcc.dg/format/c2x-strftime-1.c: Likewise. * gcc.dg/format/ext-10.c: Likewise. * gcc.dg/format/ext-9.c: Likewise. * gcc.dg/gnu11-typeof-2.c: Likewise. * gcc.dg/gnu2x-attr-syntax-1.c: Likewise. * gcc.dg/gnu2x-attr-syntax-2.c: Likewise. * gcc.dg/gnu2x-attrs-1.c: Likewise. * gcc.dg/gnu2x-attrs-2.c: Likewise. * gcc.dg/gnu2x-auto-1.c: Likewise. * gcc.dg/gnu2x-builtins-no-dfp-1.c: Likewise. * gcc.dg/gnu2x-complit-1.c: Likewise. * gcc.dg/gnu2x-complit-2.c: Likewise. * gcc.dg/gnu2x-constexpr-1.c: Likewise. * gcc.dg/gnu2x-empty-init-1.c: Likewise. * gcc.dg/gnu2x-empty-init-2.c: Likewise. * gcc.dg/gnu2x-enum-1.c: Likewise. * gcc.dg/gnu2x-static-assert-1.c: Likewise. * gcc.dg/gnu2x-stdarg-1.c: Likewise. * gcc.dg/gnu2x-typeof-1.c: Likewise. * gcc.dg/gnu2x-utf8char-1.c: Likewise. * gcc.dg/gnu2x-utf8str-type.c: Likewise. * gcc.dg/gnu2x-utf8str.c: Likewise. * gcc.dg/gomp/attrs-1.c: Likewise. * gcc.dg/gomp/attrs-10.c: Likewise. * gcc.dg/gomp/attrs-11.c: Likewise. * gcc.dg/gomp/attrs-12.c: Likewise. * gcc.dg/gomp/attrs-13.c: Likewise. * gcc.dg/gomp/attrs-14.c: Likewise. * gcc.dg/gomp/attrs-15.c: Likewise. * gcc.dg/gomp/attrs-16.c: Likewise. * gcc.dg/gomp/attrs-17.c: Likewise. * gcc.dg/gomp/attrs-18.c: Likewise. * gcc.dg/gomp/attrs-19.c: Likewise. * gcc.dg/gomp/attrs-2.c: Likewise. * gcc.dg/gomp/attrs-20.c: Likewise. * gcc.dg/gomp/attrs-21.c: Likewise. * gcc.dg/gomp/attrs-3.c: Likewise. * gcc.dg/gomp/attrs-4.c: Likewise. * gcc.dg/gomp/attrs-5.c: Likewise. * gcc.dg/gomp/attrs-6.c: Likewise. * gcc.dg/gomp/attrs-7.c: Likewise. * gcc.dg/gomp/attrs-8.c: Likewise. * gcc.dg/gomp/attrs-9.c: Likewise. * gcc.dg/limits-width-2.c: Likewise. * gcc.dg/qual-return-10.c: Likewise. * gcc.dg/qual-return-9.c: Likewise. * gcc.dg/sso-19.c: Likewise. * gcc.dg/stdckdint-1.c: Likewise. * gcc.dg/stdckdint-2.c: Likewise. * gcc.dg/stdint-width-2.c: Likewise. * gcc.dg/tm/attrs-1.c: Likewise. * gcc.dg/torture/bitint-1.c: Likewise. * gcc.dg/torture/bitint-10.c: Likewise. * gcc.dg/torture/bitint-11.c: Likewise. * gcc.dg/torture/bitint-12.c: Likewise. * gcc.dg/torture/bitint-13.c: Likewise. * gcc.dg/torture/bitint-14.c: Likewise. * gcc.dg/torture/bitint-15.c: Likewise. * gcc.dg/torture/bitint-16.c: Likewise. * gcc.dg/torture/bitint-17.c: Likewise. * gcc.dg/torture/bitint-18.c: Likewise. * gcc.dg/torture/bitint-19.c: Likewise. * gcc.dg/torture/bitint-2.c: Likewise. * gcc.dg/torture/bitint-20.c: Likewise. * gcc.dg/torture/bitint-21.c: Likewise. * gcc.dg/torture/bitint-22.c: Likewise. * gcc.dg/torture/bitint-23.c: Likewise. * gcc.dg/torture/bitint-24.c: Likewise. * gcc.dg/torture/bitint-25.c: Likewise. * gcc.dg/torture/bitint-26.c: Likewise. * gcc.dg/torture/bitint-27.c: Likewise. * gcc.dg/torture/bitint-28.c: Likewise. * gcc.dg/torture/bitint-29.c: Likewise. * gcc.dg/torture/bitint-3.c: Likewise. * gcc.dg/torture/bitint-30.c: Likewise. * gcc.dg/torture/bitint-31.c: Likewise. * gcc.dg/torture/bitint-32.c: Likewise. * gcc.dg/torture/bitint-33.c: Likewise. * gcc.dg/torture/bitint-34.c: Likewise. * gcc.dg/torture/bitint-35.c: Likewise. * gcc.dg/torture/bitint-36.c: Likewise. * gcc.dg/torture/bitint-37.c: Likewise. * gcc.dg/torture/bitint-38.c: Likewise. * gcc.dg/torture/bitint-39.c: Likewise. * gcc.dg/torture/bitint-4.c: Likewise. * gcc.dg/torture/bitint-40.c: Likewise. * gcc.dg/torture/bitint-41.c: Likewise. * gcc.dg/torture/bitint-42.c: Likewise. * gcc.dg/torture/bitint-5.c: Likewise. * gcc.dg/torture/bitint-6.c: Likewise. * gcc.dg/torture/bitint-7.c: Likewise. * gcc.dg/torture/bitint-8.c: Likewise. * gcc.dg/torture/bitint-9.c: Likewise. * gcc.dg/torture/builtin-fp-int-inexact-c2x.c: Likewise. * gcc.dg/torture/c2x-stdarg-split-1a.c: Likewise. * gcc.dg/torture/c2x-stdarg-split-1b.c: Likewise. * gcc.dg/torture/float128-nan-floath.c: Likewise. * gcc.dg/torture/float128x-nan-floath.c: Likewise. * gcc.dg/torture/float16-nan-floath.c: Likewise. * gcc.dg/torture/float32-nan-floath.c: Likewise. * gcc.dg/torture/float32x-nan-floath.c: Likewise. * gcc.dg/torture/float64-nan-floath.c: Likewise. * gcc.dg/torture/float64x-nan-floath.c: Likewise. * gcc.target/i386/excess-precision-11.c: Likewise. * gcc.target/i386/excess-precision-12.c: Likewise. * lib/target-supports.exp: Likewise. * objc.dg/attributes/gnu2x-attr-syntax-1.m: Likewise.
author: Joseph Myers <joseph@codesourcery.com> 2023-11-07 22:00:48 +0000
committer: Joseph Myers <joseph@codesourcery.com> 2023-11-07 22:00:48 +0000
commit: 54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad (patch)
tree: 2566b3808786f5d8d2eda5825d72e9b851e1d2b1
parent: 2b61b8063b83c1764e43b547223372faee4bcfbd (diff)
download: gcc-54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad.zip
gcc-54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad.tar.gz
gcc-54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad.tar.bz2
406 files changed, 607 insertions, 607 deletions
diff --git a/gcc/testsuite/c-c++-common/alias-1.c b/gcc/testsuite/c-c++-common/alias-1.c
index d72fec4..9d23494 100644
--- a/gcc/testsuite/c-c++-common/alias-1.c
+++ b/gcc/testsuite/c-c++-common/alias-1.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -Wall" } */
 /* { dg-additional-options "-std=c++20" { target c++ } } */
-/* { dg-additional-options "-std=c2x" { target c } } */
+/* { dg-additional-options "-std=c23" { target c } } */
 
 int f(int i)
 {
diff --git a/gcc/testsuite/gcc.dg/Wformat-overflow1.c b/gcc/testsuite/gcc.dg/Wformat-overflow1.c
index cf9766f..05fec5f 100644
--- a/gcc/testsuite/gcc.dg/Wformat-overflow1.c
+++ b/gcc/testsuite/gcc.dg/Wformat-overflow1.c
@@ -1,6 +1,6 @@
 /*
     { dg-do compile }
-    { dg-options "-Wformat-overflow -std=c2x" }
+    { dg-options "-Wformat-overflow -std=c23" }
 */
 
 extern int sprintf (char* restrict, const char* restrict, ...);
diff --git a/gcc/testsuite/gcc.dg/asm-scope-1.c b/gcc/testsuite/gcc.dg/asm-scope-1.c
index 6439104..4a6189b 100644
--- a/gcc/testsuite/gcc.dg/asm-scope-1.c
+++ b/gcc/testsuite/gcc.dg/asm-scope-1.c
@@ -1,6 +1,6 @@
 /* Test :: token handling in asm.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 void
 f (void)
diff --git a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c b/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c
index 1b692f5..27af3bd 100644
--- a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c
+++ b/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c
@@ -1,6 +1,6 @@
 /* Test atomic_is_lock_free for char8_t.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdatomic.h>
 #include <stdint.h>
diff --git a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c b/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c
index 1978a410..0780bb5 100644
--- a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c
+++ b/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c
@@ -1,6 +1,6 @@
-/* Test ATOMIC_VAR_INIT not in C2x.  */
+/* Test ATOMIC_VAR_INIT not in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdatomic.h>
 
diff --git a/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c b/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c
index 27a3cfe..0d99b06 100644
--- a/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c
+++ b/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c
@@ -1,5 +1,5 @@
-/* Test atomic_is_lock_free for char8_t with -std=gnu2x.  */
+/* Test atomic_is_lock_free for char8_t with -std=gnu23.  */
 /* { dg-do run } */
-/* { dg-options "-std=gnu2x -pedantic-errors" } */
+/* { dg-options "-std=gnu23 -pedantic-errors" } */
 
 #include "c2x-stdatomic-lockfree-char8_t.c"
diff --git a/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-1.c b/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-1.c
index 04704be..a85002f 100644
--- a/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-1.c
+++ b/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-1.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdatomic.h>
 
diff --git a/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-2.c b/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-2.c
index c709cb9..d83c937 100644
--- a/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-2.c
+++ b/gcc/testsuite/gcc.dg/atomic/stdatomic-bitint-2.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdatomic.h>
 
diff --git a/gcc/testsuite/gcc.dg/attr-assume-1.c b/gcc/testsuite/gcc.dg/attr-assume-1.c
index 16e919e..6433bf9 100644
--- a/gcc/testsuite/gcc.dg/attr-assume-1.c
+++ b/gcc/testsuite/gcc.dg/attr-assume-1.c
@@ -1,6 +1,6 @@
 /* Portable assumptions */
 /* { dg-do run } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 int
 f1 (int i)
diff --git a/gcc/testsuite/gcc.dg/attr-assume-2.c b/gcc/testsuite/gcc.dg/attr-assume-2.c
index aa782e7..0c83239 100644
--- a/gcc/testsuite/gcc.dg/attr-assume-2.c
+++ b/gcc/testsuite/gcc.dg/attr-assume-2.c
@@ -1,6 +1,6 @@
 /* Portable assumptions */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 [[gnu::__assume__ (1)]] void f1 (void);	/* { dg-warning "'assume' attribute not followed by ';'" } */
 					/* { dg-warning "'assume' attribute ignored" "" { target *-*-* } .-1 } */
diff --git a/gcc/testsuite/gcc.dg/attr-assume-3.c b/gcc/testsuite/gcc.dg/attr-assume-3.c
index c611a8f..f9b9a57 100644
--- a/gcc/testsuite/gcc.dg/attr-assume-3.c
+++ b/gcc/testsuite/gcc.dg/attr-assume-3.c
@@ -1,6 +1,6 @@
 /* Portable assumptions */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 void
 foo (int x)
diff --git a/gcc/testsuite/gcc.dg/attr-assume-4.c b/gcc/testsuite/gcc.dg/attr-assume-4.c
index e8a2b8d..622e296 100644
--- a/gcc/testsuite/gcc.dg/attr-assume-4.c
+++ b/gcc/testsuite/gcc.dg/attr-assume-4.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/107369 */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -O1" } */
+/* { dg-options "-std=c23 -O1" } */
 
 void
 foo (int x)
diff --git a/gcc/testsuite/gcc.dg/bitint-1.c b/gcc/testsuite/gcc.dg/bitint-1.c
index 0daa2b9..5639913 100644
--- a/gcc/testsuite/gcc.dg/bitint-1.c
+++ b/gcc/testsuite/gcc.dg/bitint-1.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 void
 foo (int x)
diff --git a/gcc/testsuite/gcc.dg/bitint-10.c b/gcc/testsuite/gcc.dg/bitint-10.c
index ac59014..d5e9c97 100644
--- a/gcc/testsuite/gcc.dg/bitint-10.c
+++ b/gcc/testsuite/gcc.dg/bitint-10.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target { bitint && dfp } } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 129
 void
diff --git a/gcc/testsuite/gcc.dg/bitint-11.c b/gcc/testsuite/gcc.dg/bitint-11.c
index 1b257ec..bf11206 100644
--- a/gcc/testsuite/gcc.dg/bitint-11.c
+++ b/gcc/testsuite/gcc.dg/bitint-11.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 int
 foo (_BitInt(127) x, _BitInt(127) y)
diff --git a/gcc/testsuite/gcc.dg/bitint-12.c b/gcc/testsuite/gcc.dg/bitint-12.c
index ed75fd1..acf1762 100644
--- a/gcc/testsuite/gcc.dg/bitint-12.c
+++ b/gcc/testsuite/gcc.dg/bitint-12.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-O2 -std=gnu2x -w" } */
+/* { dg-options "-O2 -std=gnu23 -w" } */
 
 _BitInt(37)
 foo (_BitInt(37) x, _BitInt(37) y)
diff --git a/gcc/testsuite/gcc.dg/bitint-13.c b/gcc/testsuite/gcc.dg/bitint-13.c
index 2810767..004eaec 100644
--- a/gcc/testsuite/gcc.dg/bitint-13.c
+++ b/gcc/testsuite/gcc.dg/bitint-13.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 315
 _Bool
diff --git a/gcc/testsuite/gcc.dg/bitint-14.c b/gcc/testsuite/gcc.dg/bitint-14.c
index 4c3c864..fe2d1ad 100644
--- a/gcc/testsuite/gcc.dg/bitint-14.c
+++ b/gcc/testsuite/gcc.dg/bitint-14.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint575 } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 enum A : _BitInt(15) { A0 = 0, A1 = 1 };		/* { dg-error "invalid 'enum' underlying type" } */
 enum B : unsigned _BitInt(575) { B0 = 0, B1 = 1 };	/* { dg-error "invalid 'enum' underlying type" } */
diff --git a/gcc/testsuite/gcc.dg/bitint-15.c b/gcc/testsuite/gcc.dg/bitint-15.c
index 7812970..34a944d 100644
--- a/gcc/testsuite/gcc.dg/bitint-15.c
+++ b/gcc/testsuite/gcc.dg/bitint-15.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint575 } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 enum A : _BitInt(15) { A0 = 0, A1 = 1 };		/* { dg-error "invalid 'enum' underlying type" } */
 enum B : unsigned _BitInt(575) { B0 = 0, B1 = 1 };	/* { dg-error "invalid 'enum' underlying type" } */
diff --git a/gcc/testsuite/gcc.dg/bitint-16.c b/gcc/testsuite/gcc.dg/bitint-16.c
index ccb5d15..7e1f577 100644
--- a/gcc/testsuite/gcc.dg/bitint-16.c
+++ b/gcc/testsuite/gcc.dg/bitint-16.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 _BitInt(15) a;
 _BitInt(42) b;
diff --git a/gcc/testsuite/gcc.dg/bitint-17.c b/gcc/testsuite/gcc.dg/bitint-17.c
index a0e2326..f0c902a 100644
--- a/gcc/testsuite/gcc.dg/bitint-17.c
+++ b/gcc/testsuite/gcc.dg/bitint-17.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #define expr_has_type(e, t) _Generic (e, default : 0, t : 1)
 
diff --git a/gcc/testsuite/gcc.dg/bitint-18.c b/gcc/testsuite/gcc.dg/bitint-18.c
index 9293fa4..cb13959 100644
--- a/gcc/testsuite/gcc.dg/bitint-18.c
+++ b/gcc/testsuite/gcc.dg/bitint-18.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 _Atomic _BitInt(15) a;
 _Atomic(_BitInt(15)) b;
diff --git a/gcc/testsuite/gcc.dg/bitint-19.c b/gcc/testsuite/gcc.dg/bitint-19.c
index f33a82c..665a081 100644
--- a/gcc/testsuite/gcc.dg/bitint-19.c
+++ b/gcc/testsuite/gcc.dg/bitint-19.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 #define expr_has_type(e, t) _Generic (e, default : 0, t : 1)
 
diff --git a/gcc/testsuite/gcc.dg/bitint-2.c b/gcc/testsuite/gcc.dg/bitint-2.c
index 6fa9c06..49f37bc 100644
--- a/gcc/testsuite/gcc.dg/bitint-2.c
+++ b/gcc/testsuite/gcc.dg/bitint-2.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #define expr_has_type(e, t) _Generic (e, default : 0, t : 1)
 
diff --git a/gcc/testsuite/gcc.dg/bitint-20.c b/gcc/testsuite/gcc.dg/bitint-20.c
index 6b92b5b..2f6dcf6 100644
--- a/gcc/testsuite/gcc.dg/bitint-20.c
+++ b/gcc/testsuite/gcc.dg/bitint-20.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 void
 foo (_Complex int ci, _Complex long long cl)
diff --git a/gcc/testsuite/gcc.dg/bitint-21.c b/gcc/testsuite/gcc.dg/bitint-21.c
index 72f68c9..720fb04 100644
--- a/gcc/testsuite/gcc.dg/bitint-21.c
+++ b/gcc/testsuite/gcc.dg/bitint-21.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 #define IB __SIZEOF_INT__ * __CHAR_BIT__
 typedef _BitInt(IB) V1 __attribute__((vector_size (sizeof (_BitInt(IB)))));		/* { dg-error "invalid vector type for attribute 'vector_size'" } */
diff --git a/gcc/testsuite/gcc.dg/bitint-22.c b/gcc/testsuite/gcc.dg/bitint-22.c
index 329d8a8..3e00798 100644
--- a/gcc/testsuite/gcc.dg/bitint-22.c
+++ b/gcc/testsuite/gcc.dg/bitint-22.c
@@ -1,6 +1,6 @@
 // PR c/102989
 // { dg-do compile { target bitint } }
-// { dg-options "-std=c2x -pedantic-errors" }
+// { dg-options "-std=c23 -pedantic-errors" }
 
 _BitInt(63) a;
 signed _BitInt(15) b;
diff --git a/gcc/testsuite/gcc.dg/bitint-23.c b/gcc/testsuite/gcc.dg/bitint-23.c
index 84c9eed..00aae93 100644
--- a/gcc/testsuite/gcc.dg/bitint-23.c
+++ b/gcc/testsuite/gcc.dg/bitint-23.c
@@ -1,6 +1,6 @@
 // PR c/102989
 // { dg-do compile { target bitint } }
-// { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" }
+// { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" }
 
 _BitInt(63) a;					/* { dg-warning "ISO C does not support '_BitInt\\\(63\\\)' before C23" } */
 signed _BitInt(15) b;				/* { dg-warning "ISO C does not support 'signed _BitInt\\\(15\\\)' before C23" } */
diff --git a/gcc/testsuite/gcc.dg/bitint-25.c b/gcc/testsuite/gcc.dg/bitint-25.c
index b18244f..693bc36 100644
--- a/gcc/testsuite/gcc.dg/bitint-25.c
+++ b/gcc/testsuite/gcc.dg/bitint-25.c
@@ -1,6 +1,6 @@
 // PR c/102989
 // { dg-do compile { target bitint } }
-// { dg-options "-std=c11 -Wno-c11-c2x-compat -pedantic-errors" }
+// { dg-options "-std=c11 -Wno-c11-c23-compat -pedantic-errors" }
 
 _BitInt(63) a;
 signed _BitInt(15) b;
diff --git a/gcc/testsuite/gcc.dg/bitint-28.c b/gcc/testsuite/gcc.dg/bitint-28.c
index 607c7d4..f4cb413 100644
--- a/gcc/testsuite/gcc.dg/bitint-28.c
+++ b/gcc/testsuite/gcc.dg/bitint-28.c
@@ -1,7 +1,7 @@
 /* PR c/102989 */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/bitint-29.c b/gcc/testsuite/gcc.dg/bitint-29.c
index b6a8856..31d2754 100644
--- a/gcc/testsuite/gcc.dg/bitint-29.c
+++ b/gcc/testsuite/gcc.dg/bitint-29.c
@@ -1,7 +1,7 @@
 /* PR c/102989 */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/bitint-3.c b/gcc/testsuite/gcc.dg/bitint-3.c
index c32cb35..d58b4a7 100644
--- a/gcc/testsuite/gcc.dg/bitint-3.c
+++ b/gcc/testsuite/gcc.dg/bitint-3.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 _BitInt(32) a, b = 2147483647wb;
 _BitInt(64) c, d = 9223372036854775807wb;
diff --git a/gcc/testsuite/gcc.dg/bitint-30.c b/gcc/testsuite/gcc.dg/bitint-30.c
index 48328f8..08b41cf 100644
--- a/gcc/testsuite/gcc.dg/bitint-30.c
+++ b/gcc/testsuite/gcc.dg/bitint-30.c
@@ -1,7 +1,7 @@
 /* PR c/102989 */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/bitint-31.c b/gcc/testsuite/gcc.dg/bitint-31.c
index 65ac271..d73ec6e 100644
--- a/gcc/testsuite/gcc.dg/bitint-31.c
+++ b/gcc/testsuite/gcc.dg/bitint-31.c
@@ -1,7 +1,7 @@
 /* PR c/102989 */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/bitint-32.c b/gcc/testsuite/gcc.dg/bitint-32.c
index e6c277e..b718f5e 100644
--- a/gcc/testsuite/gcc.dg/bitint-32.c
+++ b/gcc/testsuite/gcc.dg/bitint-32.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <limits.h>
 
diff --git a/gcc/testsuite/gcc.dg/bitint-34.c b/gcc/testsuite/gcc.dg/bitint-34.c
index 7eaadb2..fb69dd0 100644
--- a/gcc/testsuite/gcc.dg/bitint-34.c
+++ b/gcc/testsuite/gcc.dg/bitint-34.c
@@ -1,7 +1,7 @@
 /* PR c/102989 */
 /* Test that -funsigned-bitfields doesn't affect _BitInt bit-fields which are always signed.  */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -funsigned-bitfields" } */
+/* { dg-options "-std=c23 -funsigned-bitfields" } */
 
 struct S { _BitInt(22) a : 7; signed _BitInt(22) b : 7; unsigned _BitInt(22) c : 7; } s;
 
diff --git a/gcc/testsuite/gcc.dg/bitint-35.c b/gcc/testsuite/gcc.dg/bitint-35.c
index 352633d..5237a24 100644
--- a/gcc/testsuite/gcc.dg/bitint-35.c
+++ b/gcc/testsuite/gcc.dg/bitint-35.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target { bitint && { float32 && int32 } } } } */
-/* { dg-options "-std=c2x -Wconversion -Wfloat-conversion" } */
+/* { dg-options "-std=c23 -Wconversion -Wfloat-conversion" } */
 /* { dg-add-options float32 } */
 
 void
diff --git a/gcc/testsuite/gcc.dg/bitint-36.c b/gcc/testsuite/gcc.dg/bitint-36.c
index 1912869..a1358e1 100644
--- a/gcc/testsuite/gcc.dg/bitint-36.c
+++ b/gcc/testsuite/gcc.dg/bitint-36.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target { bitint } } } */
-/* { dg-options "-std=c2x -Wint-in-bool-context -Waddress -Wpointer-to-int-cast -Wint-to-pointer-cast -Wint-conversion -Wshift-negative-value -Wshift-count-overflow -Wdiv-by-zero" } */
+/* { dg-options "-std=c23 -Wint-in-bool-context -Waddress -Wpointer-to-int-cast -Wint-to-pointer-cast -Wint-conversion -Wshift-negative-value -Wshift-count-overflow -Wdiv-by-zero" } */
 
 extern char *ax[];
 
diff --git a/gcc/testsuite/gcc.dg/bitint-38.c b/gcc/testsuite/gcc.dg/bitint-38.c
index 1dc7a56..4fc557f 100644
--- a/gcc/testsuite/gcc.dg/bitint-38.c
+++ b/gcc/testsuite/gcc.dg/bitint-38.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #if __BITINT_MAXWIDTH__ >= 16319
 constexpr unsigned _BitInt(16319) a = 468098567701677261276215481936770442254383643766995378241600227179396283432916865881332215867106489159251577495372085663487092317743244770597287633199005374998455333587280357490149993101811392051483761495987108264964738337118155155862715438910721661230332533185335581757600511846854115932637261969633134365868695363914570578110064471868475841348589366933645410987699979080140212849909081188170910464967486231358935212897096260626033055536141835599284498474737858487658470115144771923114826312283863035503700600141440724426364699636330240414271275626021294939422483250619629005959992243418661230122132667769781183790338759345884903821695590991577228520523725302048215447841573113840811593638413425054938213262961448317898574140533090004992732688525115004782973893244091427000396890427152225308661078954671066069234453757593181753900865203439035402480306413572239610467142591920809187367438071170100969567440044691427487959785637338381651309916782063670286046547585240837892307170928849485877186793280707600840866783471799148179250818387716183127323346199533387463363442356218803779697005759324410376476855222420876262425985571982818180353870410149824214544313013285199544193496624223219986402944849622489422007678564946174797892795089330899535624727777525330789492703574564112252955147770942929761545604350869404246558274752353510370157229485004402131043153454290397929387276374054938578976878606467217359398684275050519104413914286024106808116340712273059427362293703151355498336213170698894448405369398757188523160460292714875857879968173578328191358215972493513271297875634400793301929250052822258636015650857683023900709845410838487936778533250407886180954576046340697908584020951295048844938047865657029072850797442976146895294184993736999505485665742811313795405530674199848055802759901786376822069529342971261963119332476504064285869362049662083405789828433132154933242817432809415810548180658750393692272729586232842065658490971201927780014258815333115459695117942273551876646844821076723664040282772834511419891351278169017103987094803829594286352340468346618726088781492626816188657331359104171819822673805856317828499039088088223137258297373929043307673570090396947789598799922928643843532617012164811074618881774622628943539037974883812689130801860915090035870244061005819418130068390986470314677853605080103313411837904358287837401546257413240466939893527508931541065241929872307203876443882106193262544652290132364691671910332006127864146991404015366683569317248057949596070354929361158326955551600236075268435044105880162798380799161607987365282458662031599096921825176202707890730023698706855762932691688259365358964076595824577775275991183149118372047206055118463112864604063853894820407249837871368934941438119680605528546887256934334246075596746410297954458632358171428714141820918183384435681332379317541048252391710712196623406338702061195213724569303285402242853671386113148211535691685461836458295037538034378318055108240082414441205300401526732399959228346926528586852743389490978734787926721999855388794711837164423007719626109179005466113706450765269687580819822772189301084503627297389675134228222337286867641110511061980231247884533492442898936743429641958314135329073406495776369208158032115883850691010569048983941126771477990976092252391972812691669847446798507244106121667885423025613769258102773855537509733295805013313937402282804897213847221072647111605172349464564089914906493508133855389627177663426057763252086286325343811254757681803068276278048757997425284334713190226818463023074461900176958010055572434983135171145365242339273326984465181064287264645470832091115100640584104375577304056951969456200138485313560009272338228103637763863289261673258726736753407044143664079479496972580560534494806170810469304773005873590626280072387999668522546747985701599613975101188543857852141559251634058676718308000324869809628199442681565615662912626022796064414496106344236431285697688357707992989966561557171729972093533007476947862215922583204811189015550505642082475400647639520782187776825395598257421714106473869797642678266380755873356747812273977691604147842741151722919464734890326772594979022403228191075586910464204870254674290437668861177639713112762996390246102030994917186957826982084194156870398312336059100521566034092740694642613192909850644003933745129291062576341213874815510099835708723355432970090139671120232910747665906191360160259512198160849784197597300106223945960886603127136037120000864968668651452411048372895607382907494278810971475663944948791458618662250238375166523484847507342040066801856222328988662049579299600545682490412754483621051190231623196265549391964259780178070495642538883789503379406531279338866955157646654913405181879254189185904298325865503395688786311067669273609670603076582607253527084977744533187145642686236350165593980428575119329911921382240780504527422630654086941060242757131313184709635181001199631726283364158943337968797uwb;
diff --git a/gcc/testsuite/gcc.dg/bitint-39.c b/gcc/testsuite/gcc.dg/bitint-39.c
index 1782abd..6d99464 100644
--- a/gcc/testsuite/gcc.dg/bitint-39.c
+++ b/gcc/testsuite/gcc.dg/bitint-39.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #if __BITINT_MAXWIDTH__ >= 65472
 constexpr unsigned _BitInt(65472) a = 65874028414853418769511496113653036945710467528674240836188871502976748745763974525826911024024988631776491096261751992694895296214498585327384601121850230477827515082843619768846499801840836477230687590770231681718268338714887172330888785411211246357940293072535006266916583089772232445667160886208448607927748489013059344141951625673199213945267073377588652374198634016718719257659199541018970117033192039851653491638992986532515557336069337719046396088060414869427270972708809318734227046883806081011951941853679439848321781173016681200685359617693806920032604807641414656615976627881030905633504995608500926313100449123752592887306455273713086084720226711163858729450345307982160835189085198339193053545528326363004277216519521996803653047233696840937893926439475024000274633924716672022043462512673682343650888234611610847904449303938980580750614829479521364941526248038103556791184166137132891705498670203747450648138794675915927809475689266431674447401721770257807894864574772637777546833262526951307916013054159424871918674386303422478917660124313218179561460069927914109853781325554791226906771269776791232118969314470480394982481391738558649576936680153086613697764141243587961259345656781466911451311347049773832249980208428530724233103217369963103642890811580190014250767734527431460062555356767163656837728658921843437422091225040343040245536763579475902218857185893576553568913202523567943581185934074140454243365677691321402599868371075480132367548064644179457549106582668003278353839811901755098775042915492192962256439240717885562228560807300368546591938513564249673935563354224669505426548315283725161174366021701375396395313621732692448055488113835736519133847733806933661608336123237017767589792413707136130610229516496362268872996002408911802982404007464241164929849341909484070765678046190680486057484835560562448063002010171248868062856794398851279347048705720960974749673146662296765976038110218870942100630056574273343812309347877934257043013803766940137680754965100302990989281818211387137383832600675317434920893732120105407723736041635958085676519190305809361514850656066374765384629954359307080862256105691419898168955679806156443004466405913142123628524231555115399711321193475052976374230374739915275763990520499641653144284448959338924397090731568126860006699218100212808418951593973346259258754997140003401228249592046733643429633842927437674005630309466335475488976044970815680337796705251785679176317921969250255914644143927301143156940750728409691193837462118411451140103456466642917621794037963804154558563563784540744625286045320380647149505894465602074709712052403213672513944120580472196908870481008605753502378254869195510822476848807886998210212224568817665331382282682183443019436910934518254905570403017861343476981516822213043567878416094061997484366094926060989684786188719853361377592613245034788253106057223977996442867392634883776229675223227731721808083021736947720678172726157569358655251453763272147556197009586238264046136725977202440532459363521159216893005875943650891355683793285122481839809223042446177899018320884858378858428482004887350002248475654126695437381791039346060525159596388199191045220810622260461623488951548300045143031946225548627356322494072635246741690369797703750001744527651635248045159165227990904076792563599086736013143689002450121560791866918627656264249547156379687514841821979600884946973379386059970849524777822542279884834069088756993835503335163308439818940407550289076454404410002526269749323403673331561005855976564163112359624884449722076806747002050900060486557888988389190561491837653913417576996782073392887675547243908721620711696799096385497090726000898536841269644251102949559919330359725680095583471880505317680844666709274840966390417748140336028128180466837002340200275922083519953988906089254843320339560405442077901688830870404393361047302469466448124739846498711286663890861622125303854725244017935265801954966781478807230955537079573035800508809193696776558659380041474673947719614891591483335826961674762867599639802412473648680441069062029676465317014339608126488486239504818779896608289143566814074344128163474927248996300958043211993182818053822887583188270715520756855009877038634425539657265881288715061989818229395878573316718153726750826355803265260984266618144751818838129431927560052524725127582765549442372461635957790507428542296212660482883830778100032262628335685268361076110653003933720753658626342498598108207113591628523223931344937962257434088745568685381473222813754713557301137685188707577771735719907385875925945361215971464704808214927499603711487344132091326731184707081884630565832911532419130163514966778562434847861021362218993469451376667702490745897248165073801412613710459059823342004801266188992270518474584690584110796775040192964553128155321278735400418222301274509554699483242906248842528643927491916050334115601214082061834286251573797771471610462890207070038990113517384314874988389218929593573595769992957934439472313648608872221417538591099909547681713055197851963217806394271932283786418963737083378263837851866770792294581430370179812803807766812134735008944094254924133000181138341444754146592554240244926530488085797161607440296312032375671384766799546314294952639429116053444305204179954961737670754928180951211327209631174491438566704748775957423647631106931872353072411758039523701355399245986495256131899939578128637906193987861515696267624022768855677386145040750676905386076271594075012645017847456843861067907361603785482067517607711397078496893391404908466039763474426356995787412728936302077788321037622089836944185920214948667492076372211507958383725993147568828022520584628113743069072098077681737646616832744282683301027940111008949487559489400280166812162349769417565580841259074013682180200573711186777726659689975490119163357473183919117291539140678034476458394800768806683673132266242343880852243749183854335527770813216391997262974885810843114429314160237463276656664218915730925460828760711378046669902410716387688714853282313680765227107400697209645981183025449661912571103890490913039864188897637949556486744952841792160388971558166205393610932705442433631027753841798811000777130265365602851965515681643984169325435610742993940251263241305792519709217930230875279761194839959584662947191743403356700820347334268850390650844637405501531301921096571026263943432066459294971843089035394861220552532758517810050362565876624718715634556912646641949968260622504116224630219284301623921188277675205384056375364778072061649987278221213051902862594711798265704318920329526303415071651490215159169436665502967051371583199355417397040849618260976239182865708899876580220885148819958098892407447384776849540577596373076572931387032303318606938946805395609756474317173037851890190086080334220234266081872276699590277311605725492019621206245108261399321173649438883031907502103004618343981447073270063780499728342099870986514585907891949892308658040261024667776373424978390909682927910796351757483974443865702371792838882771005747543496062821233816175876149479890010870200215632229210706418785910292789638550348725797240661293132307251159131784402794068309831964186085953199517245335059417823074979114015927625438852575505515547130205018453380351113945679912359116614886302675918646948307265762938004110601513658895196700081824586705020282825093739598881081540708217418131914073953341509242444578622435984145983493347604029272854899321609106849286714028483886414825128479818859724734438344906945298606455406699287820316660695989544913612976004949026573679384907850688667479190435572179237006408685754560762141977321367339517301097820953022755318954649838568359278646708109095740043295665248217530811189495831329465924529060656867586984790794628582957651073768585090489278140555182834690421510195303839613545873092108913694594537183285417682903243454311391369375810654906662974651031976593576633213427096627363649424527674138186816206523669842323707281027980506733634096495865602720885328039147475167492532627097604997707385503393991456792672459352936820122822469556596945676396903590546739682393729575454493944807057345819069181271569904644175551803259147445317231361820692382321822423289376965920517760072762131028848540838123733912106843655308311750496550815033703056692798798011918005011348199727933997069164542544843124651534694478753855625309629960678863623815672915274926726965714364858257611221106385074050699918280948177141442387115797213194242870596023564029577989498938485534058029690537190534744252272824857327493965876618976643677984346169877601719298683399281042997338804443874233186946808040598508364557521255575013579815682146068863549337248303001248078807047378108920762143811221461759354620875369589065024312588898065507971561029929345527858159313129820327669633132293160565999400466976147547125003253164886640290777125287017292361727094985547014756417512102317970262384641051079277427351725574074131116107146600399234403647819323600759586671280733725982209124764267999221147483008839140602670257205078780970624480127071396543158542953522136110465710368242064084840890205082187266645629140357952494765688460918507878486426042065278647584015295279651155982623258616377485606104157632043716067693156340573589748375359059722913343059515310846221532353844339794755668848402309080774422293295651170084782844354070621520168937868316086040235069146058345289688192907685918900389066798118530800450286088002427616043549842138481236713776013883531628590595300042847329197168381891936968101967776014081901912034332263670677828204428422384434715718704595120461430375574175765702011953092786008531618841562463621545904938593447520015052398913473747165675739128227729860522837856493359404981275620405156088407724873896814306917527150300142982470028171920769744429179320431741610875850043999674743188496908160129431272106464679454201996897333414256543788368259896759637862338268498926658644196226425393282232669383401043410041622131834269331249053253163263805617292232014554953766603366944449281936436163348007550264881313734403499866885910422096847245868983837395381509905362814510495294417227071475516750438538914922504534834593033205080900795488912148742019119549014001554366911119067584994744299018308039208210417466906415185076706749205801012799329399986289204986294786437588639612782571971507723771937929701163710244163043404564826267800950589676152533594989418618014288641614520385570184240884586130870870741886347468641829857183453740491569842565622064996027914799445938815414612045489948609894048719358464589599498624644809962127765563981065415756251258118421436949142446606626464150436046745354962830933231617087191036634528282763930864590672989015325808346540917086018285482216294776630407604444017209836386813546251369184558393180862727824133618231105407565377726874201016716874747193298110226548713113055804386335542276584785327642141420979789128607575389126059449056231221655504322975168824547921598754212580284860341317067232171503075318659142194545497016145803181512026343421286297638468103352223053704896868265116206256544679438575897966426762874745106558292347134875728572127325337754733765251105470177415270966206899861267252369448068927266102835975020557437913164840102135985178231875990189340734544654744647827441286010902235438982564998068477390121580268067852517302500958493927727155669887335454802232441766876959727296032213883872141451322900261005024406412638925534447309297109774680653396839068981982303959449585919601951784676269338509798444492284027198527534729264816863223855205480827392176674198533541998652285208950844368772121015938775827868718348053651466660945842822857135950701469458166244446036560410696408598768008796242326788817178564489668276079897020785729862548025216683403145162467545641729518620497596028019199039246447845134132855463133735174323788649842018758419435906318743206053356800088370917852318294527105533345230477001222310383402828126358397712503413591645611054601866497386469412638491773728614643382590286186308330017723253240683781406419919818813502414034869402770627046602136910556735340620577006649826384200614066464173557086745764379665102794298748986565199421337796563169859800331533497258203854653725133871631985474523134061290217790871839012014060652170431386706390526266713354909666532894989712338707426377288105959729380930582675275553400044698473843175010204608057871421993855679325795511343440323540375249581001966431109313820512103729737415876492397855350709356620428053728631513279657137136751691815273101807269203767363250781488995922177169506473238033222632470640191052132325977988500916888797348877819383961059260577892204584222324373872871821748974613401628203875338762555211387910748411152327539619567997694542831475663395895555090404922654858513105597129946139446385944075046977527087443129745077809595756576233514427417022666744060487857898390789948480719931806881956529624868523931326204018924742455510988728560620886881508902552006781252685182126521983698023601752690226917489683075686040459944761124984353820735928331227975669811495025536004835557357866887952405925158206358648460053744971810759800516971341251283976744691594110219822376535068050425606180275339861939768053672977590839860433707369056754028768873245370748243872093908425321452790676005744239063004090812287994171654371534280527461204785965744686899037505526748205474829861508775633341610106216825084287086663714002411976655574453853711919148720158805545980786494280975922278491841813051023374114075744194873828536865132926198728339588170375472796201352742410432853435729363112226201941628255002535490275056766586373821459331811284350772302429368659539685224295962240105465692745743117250558134122530552966969305908586250082284865580325406190790343864287037227316258520732020059190355270848306662653818702002897039308630618431243314449931945150585878901504845973215101937953823928461721757938572553687288827606914187939448631587847341567152264836920949873736396479054462466993545281884314888041635210657865924492733477634678092762053049423724420978749565535935202527272735525538857856532535829727403758248515676377734964271319895603733369499282090619370644390912703118190967699735839422150118676090812589197956828432883454591775506142072991995255477162685456179917844477810916117758366522467183885517800565518850836567463260579936570404378905085631880126835957647088321534365595303983957495652572590640830763831479030713794949481583992861854626122255507636651728698938040296394529620734556222565311409570754214795520535003346400553934254868951469742466063081282009587365288248731116040001268793498485153779630516908276030764263795595829834765298430173859886036974114210469592900822522496578393807022364135855868617791972115817676751055814736691157277719078078363722995682352787453931398544225888615155245513172842244076107970477685087347438625378887619302413866466619117008334792748656074141300284702324314107158575021092021045201219104849568044014318163216648167167102545567590192051572811882759399171815091482243321889561619871953313830812925825376241612376634587322435846044799053536631550927269169032948586514626083989734654942487786073128339707925635994571914892483303685762083840487806131930731387849170685349079864020207179382689618594010162070659159447889344283707204286255036729730123415253795453381392363525730409662963512930464146567702953413882972452890687402324823676434623668607417451713252684608112007770743378032124178068076627655591705783142289469636449645674093183854831679943102480054334422336004642534472137802293959591564047787165742281711262045913463889166614975785367285123231848489964947168259259859651331806294100233514606935240876224388286907295795623525145565485264076203685696921301244157049222399694261123517677386771518164905737344603978252996052580868902923124475552914011730528812300179021230309867253769880851013594703320917123515967493597713163002806913617288734951731859626757112576606989339415205916570757259477367425003980820415407690284037569443414621271531087857711540292395118940327930085917648961413854880713533683379365683118321440194053278494655321531901445796224168264056771141704976004602347371222102339725674327295424584923438972729801604160881606371129484752571956550759895866459266634599318934331132992268419492312051515244634605489726581981774372625890847390663222639677778599130509229036502941438146903740421129745765409463741046041724109743995541832910890810043237637250838512421266274159269838087162966877339415320918445838084607926482487326890808603331454937071756872582541587950869617374867497291942434166388340736188426522646778126260187474459305273317048369223194305392592429269796065446394224285706245837186991386807972768134945406804843677986121363618283994623075786820519030677924524631232773053566327068836914008068880508593892814413599933512127846256450189605965007722408749599327105633360191669226811125705464166865932685139499043188417058408145619475137407704309057096253453970943431010208805958880441668536636630984528024738383726952579394912266155766194059496573034122939179354744906886317447299846294675145801761429867331920860320689436106861896387056042301081513818264319294187170363122704106526138368915635603316494940799629455580847884255301629707874127819875328740309245368068925386845081146527751898281929519183808884694732922929381859998068561552287796638630153557107517603976885737408961385726894117817772124305384275773752681561772589162896726543848118292224854735017911552771598879672195419903142467189758288893617797981332645308463000380199968291172662286342433407530992399311582382371037051384107721693674935016059465473282177680148455402959465472212928981753238596329614601855483413398833842270568295296640743598590779752989551301629995771523000231911679050279485698305095423321484021804360883790254659446161386801194534079288499545690468910577746611299797864563154863490832639144410652702292169488612519356587316152787229543906355470677554502438539602268426767473565515536424169935736875415273620834081490730213150398951736650842108450857240742774594217852879173672688751229305531115825014850231000546945150122964624749643195594303796058701805941210884086651903723484629069594503110445498020891082678423358251793036052092074949457345902128190663782180041297332240668738760754685732067836519097118357790131727679935781054122263807112935237022613351668926147398489883137771515688789600851256388568716495659230435230035583859074576720408679091908831650422755099588394054135377265310497551564802196750405263555192208913371509621178676044203357752939238134233705209988483613418357068790410292407284985250078216801955681819735640889915286539424767699291558260497936451862444377162411777198512727507682930531190062304184267580007068243872442587201835784461931300341180739516168341521559240873860541511979663086972805839349071094889623734952370289999461430319855751397225742175395567834824532612348799185498233668108399584932908791423527338415192594890797161640870428514483903241405192766090688820461474694129483396941450655378070502596902012960005925071407505634409039374591587356995126256441595045666991786542475413106212634440243252914105680546441834800933952893940680530366893360583164583102871341878638954296317852245050855362654227742890577697939811035528084823005072060163844309859018655879693761266441850506107247499887845837529072734963012358189223535309540488630641402694119285809766132525455640455074277103890569921925511571780900429074779519535887352143224202076526307608773803900609314478528807884041223459718478713147780482731067298371645459172074879456665672144659257063151846218815521853521538039105580092129093604550652176702149722267464711925176295825259195451897982973468788292910834248649486634164719847512355589622486356044931885992391641340252366296529307289311708336501951699737694422661506981734291820308445302217945166uwb;
diff --git a/gcc/testsuite/gcc.dg/bitint-4.c b/gcc/testsuite/gcc.dg/bitint-4.c
index 4c2446b..badf602 100644
--- a/gcc/testsuite/gcc.dg/bitint-4.c
+++ b/gcc/testsuite/gcc.dg/bitint-4.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 _BitInt(2)
 foo (_BitInt(2) x, _BitInt(15) y)
diff --git a/gcc/testsuite/gcc.dg/bitint-5.c b/gcc/testsuite/gcc.dg/bitint-5.c
index ebd6c18..0adfa31 100644
--- a/gcc/testsuite/gcc.dg/bitint-5.c
+++ b/gcc/testsuite/gcc.dg/bitint-5.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/gcc/testsuite/gcc.dg/bitint-6.c b/gcc/testsuite/gcc.dg/bitint-6.c
index f4d7366..ad32ea4 100644
--- a/gcc/testsuite/gcc.dg/bitint-6.c
+++ b/gcc/testsuite/gcc.dg/bitint-6.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int *q, *r, *s;
 
diff --git a/gcc/testsuite/gcc.dg/bitint-7.c b/gcc/testsuite/gcc.dg/bitint-7.c
index ed6d577..84b7df7 100644
--- a/gcc/testsuite/gcc.dg/bitint-7.c
+++ b/gcc/testsuite/gcc.dg/bitint-7.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 257
 void
diff --git a/gcc/testsuite/gcc.dg/bitint-8.c b/gcc/testsuite/gcc.dg/bitint-8.c
index 83ef0f8..c18fd6b 100644
--- a/gcc/testsuite/gcc.dg/bitint-8.c
+++ b/gcc/testsuite/gcc.dg/bitint-8.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-O2 -std=c2x -Wno-uninitialized" } */
+/* { dg-options "-O2 -std=c23 -Wno-uninitialized" } */
 
 #if __BITINT_MAXWIDTH__ >= 135
 _BitInt(135)
diff --git a/gcc/testsuite/gcc.dg/bitint-9.c b/gcc/testsuite/gcc.dg/bitint-9.c
index c3777b1..ceb41fa 100644
--- a/gcc/testsuite/gcc.dg/bitint-9.c
+++ b/gcc/testsuite/gcc.dg/bitint-9.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target { bitint && exceptions } } } */
-/* { dg-options "-O2 -std=gnu2x -fnon-call-exceptions -fexceptions" } */
+/* { dg-options "-O2 -std=gnu23 -fnon-call-exceptions -fexceptions" } */
 
 __attribute__((noipa)) void
 baz (int *p)
diff --git a/gcc/testsuite/gcc.dg/c11-attr-syntax-3.c b/gcc/testsuite/gcc.dg/c11-attr-syntax-3.c
index 4d7cb77..8f07444 100644
--- a/gcc/testsuite/gcc.dg/c11-attr-syntax-3.c
+++ b/gcc/testsuite/gcc.dg/c11-attr-syntax-3.c
@@ -1,7 +1,7 @@
-/* Test C2x attribute syntax: rejected in C11, but warning disabled
-   with -Wno-c11-c2x-compat.  */
+/* Test C23 attribute syntax: rejected in C11, but warning disabled
+   with -Wno-c11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic -Wno-c11-c23-compat" } */
 
 [[]];
 
diff --git a/gcc/testsuite/gcc.dg/c11-builtins-1.c b/gcc/testsuite/gcc.dg/c11-builtins-1.c
index bfadf70..8139140 100644
--- a/gcc/testsuite/gcc.dg/c11-builtins-1.c
+++ b/gcc/testsuite/gcc.dg/c11-builtins-1.c
@@ -1,4 +1,4 @@
-/* Test C11 built-in functions: test functions new in C2x are not
+/* Test C11 built-in functions: test functions new in C23 are not
    declared as built-in for C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11" } */
diff --git a/gcc/testsuite/gcc.dg/c11-complit-1.c b/gcc/testsuite/gcc.dg/c11-complit-1.c
index e191ceb..250dd20 100644
--- a/gcc/testsuite/gcc.dg/c11-complit-1.c
+++ b/gcc/testsuite/gcc.dg/c11-complit-1.c
@@ -1,4 +1,4 @@
-/* Test C2x storage class specifiers in compound literals not permitted for
+/* Test C23 storage class specifiers in compound literals not permitted for
    C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
diff --git a/gcc/testsuite/gcc.dg/c11-complit-2.c b/gcc/testsuite/gcc.dg/c11-complit-2.c
index d4d1f16..3ac4bb08 100644
--- a/gcc/testsuite/gcc.dg/c11-complit-2.c
+++ b/gcc/testsuite/gcc.dg/c11-complit-2.c
@@ -1,4 +1,4 @@
-/* Test C2x storage class specifiers in compound literals not permitted for
+/* Test C23 storage class specifiers in compound literals not permitted for
    C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic" } */
diff --git a/gcc/testsuite/gcc.dg/c11-complit-3.c b/gcc/testsuite/gcc.dg/c11-complit-3.c
index a73a8ef..e85b4ed 100644
--- a/gcc/testsuite/gcc.dg/c11-complit-3.c
+++ b/gcc/testsuite/gcc.dg/c11-complit-3.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals not permitted for
-   C11, but -Wno-c11-c2x-compat disables the -pedantic diagnostic for that.  */
+/* Test C23 storage class specifiers in compound literals not permitted for
+   C11, but -Wno-c11-c23-compat disables the -pedantic diagnostic for that.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c23-compat" } */
 
 int *ps = &(static int) { 1 };
 int ss = sizeof (static int) { 1 };
diff --git a/gcc/testsuite/gcc.dg/c11-digit-separators-1.c b/gcc/testsuite/gcc.dg/c11-digit-separators-1.c
index fc83226..ab25470 100644
--- a/gcc/testsuite/gcc.dg/c11-digit-separators-1.c
+++ b/gcc/testsuite/gcc.dg/c11-digit-separators-1.c
@@ -1,4 +1,4 @@
-/* Test C2x digit separators not in C11.  */
+/* Test C23 digit separators not in C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-empty-init-3.c b/gcc/testsuite/gcc.dg/c11-empty-init-3.c
index fd43fa7..91523e7 100644
--- a/gcc/testsuite/gcc.dg/c11-empty-init-3.c
+++ b/gcc/testsuite/gcc.dg/c11-empty-init-3.c
@@ -1,6 +1,6 @@
 /* Test C11 does not support empty initializers.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -Wc11-c2x-compat" } */
+/* { dg-options "-std=c11 -Wc11-c23-compat" } */
 
 struct s { int a; };
 struct s s = {}; /* { dg-warning "empty initializer" } */
diff --git a/gcc/testsuite/gcc.dg/c11-enum-1.c b/gcc/testsuite/gcc.dg/c11-enum-1.c
index 571041d..556ccfd 100644
--- a/gcc/testsuite/gcc.dg/c11-enum-1.c
+++ b/gcc/testsuite/gcc.dg/c11-enum-1.c
@@ -1,4 +1,4 @@
-/* Test C2x enumerations with values not representable in int are diagnosed for
+/* Test C23 enumerations with values not representable in int are diagnosed for
    C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
diff --git a/gcc/testsuite/gcc.dg/c11-enum-2.c b/gcc/testsuite/gcc.dg/c11-enum-2.c
index 5b07c8d..46d1ae9 100644
--- a/gcc/testsuite/gcc.dg/c11-enum-2.c
+++ b/gcc/testsuite/gcc.dg/c11-enum-2.c
@@ -1,4 +1,4 @@
-/* Test C2x enumerations with values not representable in int are diagnosed for
+/* Test C23 enumerations with values not representable in int are diagnosed for
    C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic" } */
diff --git a/gcc/testsuite/gcc.dg/c11-enum-3.c b/gcc/testsuite/gcc.dg/c11-enum-3.c
index 8266d4e..8cebd33 100644
--- a/gcc/testsuite/gcc.dg/c11-enum-3.c
+++ b/gcc/testsuite/gcc.dg/c11-enum-3.c
@@ -1,7 +1,7 @@
-/* Test C2x enumerations with values not representable in int are not diagnosed
-   for C11 with -pedantic-errors -Wno-c11-c2x-compat.  */
+/* Test C23 enumerations with values not representable in int are not diagnosed
+   for C11 with -pedantic-errors -Wno-c11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c23-compat" } */
 
 enum e1 { e1a = -__LONG_LONG_MAX__ - 1 };
 
diff --git a/gcc/testsuite/gcc.dg/c11-enum-4.c b/gcc/testsuite/gcc.dg/c11-enum-4.c
index 57dd92a..12f6c22 100644
--- a/gcc/testsuite/gcc.dg/c11-enum-4.c
+++ b/gcc/testsuite/gcc.dg/c11-enum-4.c
@@ -1,4 +1,4 @@
-/* Test C2x enumerations with fixed underlying type are diagnosed for C11.  */
+/* Test C23 enumerations with fixed underlying type are diagnosed for C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-enum-5.c b/gcc/testsuite/gcc.dg/c11-enum-5.c
index 91d681f..640f185 100644
--- a/gcc/testsuite/gcc.dg/c11-enum-5.c
+++ b/gcc/testsuite/gcc.dg/c11-enum-5.c
@@ -1,4 +1,4 @@
-/* Test C2x enumerations with fixed underlying type are diagnosed for C11.  */
+/* Test C23 enumerations with fixed underlying type are diagnosed for C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic" } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-enum-6.c b/gcc/testsuite/gcc.dg/c11-enum-6.c
index cd708bd..a720110 100644
--- a/gcc/testsuite/gcc.dg/c11-enum-6.c
+++ b/gcc/testsuite/gcc.dg/c11-enum-6.c
@@ -1,7 +1,7 @@
-/* Test C2x enumerations with fixed underlying type are not diagnosed for C11
-   with -pedantic-errors -Wno-c11-c2x-compat.  */
+/* Test C23 enumerations with fixed underlying type are not diagnosed for C11
+   with -pedantic-errors -Wno-c11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c23-compat" } */
 
 enum e1 : int;
 enum e2 : short { A };
diff --git a/gcc/testsuite/gcc.dg/c11-floatn-5.c b/gcc/testsuite/gcc.dg/c11-floatn-5.c
index 679022a..f5f9d39 100644
--- a/gcc/testsuite/gcc.dg/c11-floatn-5.c
+++ b/gcc/testsuite/gcc.dg/c11-floatn-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -Wc11-c2x-compat" } */
+/* { dg-options "-std=c11 -Wc11-c23-compat" } */
 /* { dg-add-options float32 } */
 /* { dg-add-options float64 } */
 /* { dg-add-options float32x } */
diff --git a/gcc/testsuite/gcc.dg/c11-floatn-6.c b/gcc/testsuite/gcc.dg/c11-floatn-6.c
index 9f76b83..efbf1e6 100644
--- a/gcc/testsuite/gcc.dg/c11-floatn-6.c
+++ b/gcc/testsuite/gcc.dg/c11-floatn-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -Wc11-c2x-compat" } */
+/* { dg-options "-std=c11 -Wc11-c23-compat" } */
 /* { dg-add-options float128 } */
 /* { dg-require-effective-target float128 } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-floatn-7.c b/gcc/testsuite/gcc.dg/c11-floatn-7.c
index 3da9bb9..baae8d8 100644
--- a/gcc/testsuite/gcc.dg/c11-floatn-7.c
+++ b/gcc/testsuite/gcc.dg/c11-floatn-7.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -Wc11-c2x-compat" } */
+/* { dg-options "-std=c11 -Wc11-c23-compat" } */
 /* { dg-add-options float16 } */
 /* { dg-require-effective-target float16 } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-floatn-8.c b/gcc/testsuite/gcc.dg/c11-floatn-8.c
index 63c6238..7cf2c18 100644
--- a/gcc/testsuite/gcc.dg/c11-floatn-8.c
+++ b/gcc/testsuite/gcc.dg/c11-floatn-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -Wc11-c2x-compat" } */
+/* { dg-options "-std=c11 -Wc11-c23-compat" } */
 /* { dg-add-options float64x } */
 /* { dg-require-effective-target float64x } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-fordecl-3.c b/gcc/testsuite/gcc.dg/c11-fordecl-3.c
index 28ef629..a5d34c5 100644
--- a/gcc/testsuite/gcc.dg/c11-fordecl-3.c
+++ b/gcc/testsuite/gcc.dg/c11-fordecl-3.c
@@ -1,6 +1,6 @@
 /* Test restrictions on the kind of declarations permitted in for loops removed
-   in C2X, and thus with -std=c11 -pedantic -Wno-c11-c2x-compat.  */
+   in C23, and thus with -std=c11 -pedantic -Wno-c11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic -Wno-c11-c23-compat" } */
 
 #include "c99-fordecl-2.c"
diff --git a/gcc/testsuite/gcc.dg/c11-fordecl-4.c b/gcc/testsuite/gcc.dg/c11-fordecl-4.c
index 2a352d6..d8c5bdf 100644
--- a/gcc/testsuite/gcc.dg/c11-fordecl-4.c
+++ b/gcc/testsuite/gcc.dg/c11-fordecl-4.c
@@ -1,6 +1,6 @@
 /* Test restrictions on the kind of declarations permitted in for loops removed
-   in C2X, and thus with -std=c11 -pedantic -Wno-c11-c2x-compat.  */
+   in C23, and thus with -std=c11 -pedantic -Wno-c11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic -Wno-c11-c23-compat" } */
 
 #include "c99-fordecl-3.c"
diff --git a/gcc/testsuite/gcc.dg/c11-keywords-1.c b/gcc/testsuite/gcc.dg/c11-keywords-1.c
index 997c1b0..30fd072 100644
--- a/gcc/testsuite/gcc.dg/c11-keywords-1.c
+++ b/gcc/testsuite/gcc.dg/c11-keywords-1.c
@@ -1,4 +1,4 @@
-/* Test new C2x keywords not keywords in C11.  */
+/* Test new C23 keywords not keywords in C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-old-style-definition-1.c b/gcc/testsuite/gcc.dg/c11-old-style-definition-1.c
index 74164b7..b2c9efc 100644
--- a/gcc/testsuite/gcc.dg/c11-old-style-definition-1.c
+++ b/gcc/testsuite/gcc.dg/c11-old-style-definition-1.c
@@ -1,4 +1,4 @@
-/* Test old-style function definitions not in C2x: allowed in C11.  */
+/* Test old-style function definitions not in C23: allowed in C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-old-style-definition-2.c b/gcc/testsuite/gcc.dg/c11-old-style-definition-2.c
index a22f555..89152ce 100644
--- a/gcc/testsuite/gcc.dg/c11-old-style-definition-2.c
+++ b/gcc/testsuite/gcc.dg/c11-old-style-definition-2.c
@@ -1,4 +1,4 @@
-/* Test old-style function definitions not in C2x: () does not give
+/* Test old-style function definitions not in C23: () does not give
    type with a prototype for older standards.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11" } */
diff --git a/gcc/testsuite/gcc.dg/c11-parm-omit-3.c b/gcc/testsuite/gcc.dg/c11-parm-omit-3.c
index 5bf27a0..c7076f0 100644
--- a/gcc/testsuite/gcc.dg/c11-parm-omit-3.c
+++ b/gcc/testsuite/gcc.dg/c11-parm-omit-3.c
@@ -1,5 +1,5 @@
-/* Test omitted parameter names not in C11: -pedantic -Wno-c11-c2x-compat.  */
+/* Test omitted parameter names not in C11: -pedantic -Wno-c11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic -Wno-c11-c23-compat" } */
 
 void f (int) { }
diff --git a/gcc/testsuite/gcc.dg/c11-qual-1.c b/gcc/testsuite/gcc.dg/c11-qual-1.c
index f731e06..eab9f6f 100644
--- a/gcc/testsuite/gcc.dg/c11-qual-1.c
+++ b/gcc/testsuite/gcc.dg/c11-qual-1.c
@@ -1,4 +1,4 @@
-/* Test that qualifiers are lost in tertiary operator for pointers to arrays before C2X, PR98397 */
+/* Test that qualifiers are lost in tertiary operator for pointers to arrays before C23, PR98397 */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors -Wno-discarded-array-qualifiers" } */
 
diff --git a/gcc/testsuite/gcc.dg/c11-static-assert-9.c b/gcc/testsuite/gcc.dg/c11-static-assert-9.c
index 93696ab..a87e9dc 100644
--- a/gcc/testsuite/gcc.dg/c11-static-assert-9.c
+++ b/gcc/testsuite/gcc.dg/c11-static-assert-9.c
@@ -1,6 +1,6 @@
 /* Test C11 static assertions.  Omitting the string not supported, but
-   -Wno-c11-c2x-compat disables the -pedantic diagnostic for that.  */
+   -Wno-c11-c23-compat disables the -pedantic diagnostic for that.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic -Wno-c11-c23-compat" } */
 
 _Static_assert (1);
diff --git a/gcc/testsuite/gcc.dg/c11-stdarg-3.c b/gcc/testsuite/gcc.dg/c11-stdarg-3.c
index 0092924..fe31de4 100644
--- a/gcc/testsuite/gcc.dg/c11-stdarg-3.c
+++ b/gcc/testsuite/gcc.dg/c11-stdarg-3.c
@@ -1,7 +1,7 @@
 /* Test variadic functions with no named parameters not supported in C11, but
-   diagnostic disabled with -Wno-c11-c2x-compat.  */
+   diagnostic disabled with -Wno-c11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c2x-compat" } */
+/* { dg-options "-std=c11 -pedantic-errors -Wno-c11-c23-compat" } */
 
 int f (...);
 int g (int (...));
diff --git a/gcc/testsuite/gcc.dg/c11-unproto-1.c b/gcc/testsuite/gcc.dg/c11-unproto-1.c
index 0949c7b..37a39a9 100644
--- a/gcc/testsuite/gcc.dg/c11-unproto-1.c
+++ b/gcc/testsuite/gcc.dg/c11-unproto-1.c
@@ -1,4 +1,4 @@
-/* Test compatibility of unprototyped and prototyped function types (C2x made
+/* Test compatibility of unprototyped and prototyped function types (C23 made
    the case of types affected by default argument promotions compatible, before
    removing unprototyped functions completely).  Test affected usages are not
    accepted for C11.  */
diff --git a/gcc/testsuite/gcc.dg/c11-unproto-2.c b/gcc/testsuite/gcc.dg/c11-unproto-2.c
index 06da935..ca7b07f 100644
--- a/gcc/testsuite/gcc.dg/c11-unproto-2.c
+++ b/gcc/testsuite/gcc.dg/c11-unproto-2.c
@@ -1,6 +1,6 @@
-/* Test compatibility of unprototyped and prototyped function types (C2x made
+/* Test compatibility of unprototyped and prototyped function types (C23 made
    the case of types affected by default argument promotions compatible, before
-   removing unprototyped functions completely).  Test always-invalid-in-C2x
+   removing unprototyped functions completely).  Test always-invalid-in-C23
    usages, in C11 mode.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
diff --git a/gcc/testsuite/gcc.dg/c11-utf8char-1.c b/gcc/testsuite/gcc.dg/c11-utf8char-1.c
index 26dbd92..778ca0f 100644
--- a/gcc/testsuite/gcc.dg/c11-utf8char-1.c
+++ b/gcc/testsuite/gcc.dg/c11-utf8char-1.c
@@ -1,4 +1,4 @@
-/* Test C2x UTF-8 characters.  Test not accepted for C11.  */
+/* Test C23 UTF-8 characters.  Test not accepted for C11.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic-errors" } */
 
diff --git a/gcc/testsuite/gcc.dg/c17-nullptr-2.c b/gcc/testsuite/gcc.dg/c17-nullptr-2.c
index a6ad770..8c94191 100644
--- a/gcc/testsuite/gcc.dg/c17-nullptr-2.c
+++ b/gcc/testsuite/gcc.dg/c17-nullptr-2.c
@@ -1,4 +1,4 @@
-/* Test that we don't predefine `nullptr' pre-C2X.  */
+/* Test that we don't predefine `nullptr' pre-C23.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c17 -pedantic-errors" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-align-1.c b/gcc/testsuite/gcc.dg/c2x-align-1.c
index 25dbd62..840f97d 100644
--- a/gcc/testsuite/gcc.dg/c2x-align-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-align-1.c
@@ -1,6 +1,6 @@
-/* Test C2x alignment support.  Test valid code.  */
+/* Test C23 alignment support.  Test valid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stddef.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-align-6.c b/gcc/testsuite/gcc.dg/c2x-align-6.c
index 8559a58..bc3adcf 100644
--- a/gcc/testsuite/gcc.dg/c2x-align-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-align-6.c
@@ -1,6 +1,6 @@
-/* Test C2x alignof returning minimum alignment for a type.  */
+/* Test C23 alignof returning minimum alignment for a type.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #define _Alignas alignas
 #define _Alignof alignof
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c
index 227c241..932336a 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c
@@ -1,6 +1,6 @@
-/* Test C2x deprecated attribute: valid uses.  */
+/* Test C23 deprecated attribute: valid uses.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* Similar to tests from gnu2x-attrs-1.c, but using the standard
    attribute instead of gnu::deprecated, and sometimes using
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c
index 7c01317..eb1e508 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c
@@ -1,6 +1,6 @@
-/* Test C2x deprecated attribute: invalid contexts.  */
+/* Test C23 deprecated attribute: invalid contexts.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* This attribute is not valid in most cases on types other than their
    definitions, or on labels, or on statements, or as an
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c
index 044725e..c305e9e 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c
@@ -1,6 +1,6 @@
-/* Test C2x deprecated attribute: invalid syntax.  */
+/* Test C23 deprecated attribute: invalid syntax.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[deprecated()]] int a; /* { dg-error "parentheses must be omitted if attribute argument list is empty" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c
index 7698434..aa0d8e5 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c
@@ -1,6 +1,6 @@
-/* Test C2x deprecated attribute: duplicates (allowed after N2557).  */
+/* Test C23 deprecated attribute: duplicates (allowed after N2557).  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[deprecated, __deprecated__]] int a;
 [[__deprecated__, deprecated("message")]] int b;
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c
index 60fe11d..4c13649 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c
@@ -1,6 +1,6 @@
-/* Test C2x attribute syntax.  Valid use of fallthrough attribute.  */
+/* Test C23 attribute syntax.  Valid use of fallthrough attribute.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wextra" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wextra" } */
 
 int
 f (int a, int c)
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c
index b65bcbe..ec47321 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c
@@ -1,6 +1,6 @@
-/* Test C2x attribute syntax.  Invalid use of fallthrough attribute.  */
+/* Test C23 attribute syntax.  Invalid use of fallthrough attribute.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wextra" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wextra" } */
 
 [[fallthrough]]; /* { dg-error "'fallthrough' attribute at top level" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c
index 714d0af..38da8a3 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c
@@ -1,7 +1,7 @@
-/* Test C2x attribute syntax.  Invalid use of fallthrough attribute
+/* Test C23 attribute syntax.  Invalid use of fallthrough attribute
    outside switch.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wextra" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wextra" } */
 
 int
 f (int a)
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c
index a6cedcd..1f42517 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c
@@ -1,6 +1,6 @@
-/* Test C2x fallthrough attribute: duplicates (allowed after N2557).  */
+/* Test C23 fallthrough attribute: duplicates (allowed after N2557).  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int
 f (int a)
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c
index c614ceb..87d1f6e 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c
@@ -1,6 +1,6 @@
-/* Test C2x fallthrough attribute: mixtures with other attributes.  */
+/* Test C23 fallthrough attribute: mixtures with other attributes.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* Use of other standard attributes together with "fallthrough" goes
    through a different path to diagnosing ignored attributes from that
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c
index aa7ff4c..0984d67 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c
@@ -1,7 +1,7 @@
-/* Test C2x attribute syntax.  Invalid use of fallthrough attribute in
+/* Test C23 attribute syntax.  Invalid use of fallthrough attribute in
    bad context inside switch.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wextra" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wextra" } */
 
 int
 f (int a)
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c
index 7090a3f..60562ae 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c
@@ -1,6 +1,6 @@
-/* Test C2x maybe_unused attribute: valid uses.  */
+/* Test C23 maybe_unused attribute: valid uses.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wall -Wextra -Wunused" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wall -Wextra -Wunused" } */
 
 [[maybe_unused]] static void f1 (void) {}
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c
index a749639..c89a1b4 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c
@@ -1,6 +1,6 @@
-/* Test C2x maybe_unused attribute: invalid contexts.  */
+/* Test C23 maybe_unused attribute: invalid contexts.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* This attribute is not valid in most cases on types other than their
    definitions, or on statements, or as an attribute-declaration.  */
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c
index 4d4da08..fe5d61a 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c
@@ -1,6 +1,6 @@
-/* Test C2x maybe_unused attribute: invalid syntax.  */
+/* Test C23 maybe_unused attribute: invalid syntax.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[maybe_unused()]] int a; /* { dg-error "does not take any arguments" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c
index 6b997aa..3a2a248 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c
@@ -1,6 +1,6 @@
-/* Test C2x maybe_unused attribute: duplicates (allowed after N2557).  */
+/* Test C23 maybe_unused attribute: duplicates (allowed after N2557).  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[maybe_unused, __maybe_unused__]] int a;
 [[__maybe_unused__, maybe_unused]] int b;
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c
index f4893bd..0740048 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c
@@ -1,6 +1,6 @@
-/* Test C2x deprecated attribute: valid uses.  */
+/* Test C23 deprecated attribute: valid uses.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[nodiscard]] int c1 (void); /* { dg-message "declared here" } */
 [[__nodiscard__ ("some reason")]] int c2 (void); /* { dg-message "declared here" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c
index 0ed2ebe..4441be4 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c
@@ -1,6 +1,6 @@
-/* Test C2x nodiscard attribute: invalid contexts.  */
+/* Test C23 nodiscard attribute: invalid contexts.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* This attribute is not valid on types other than their definitions,
    or on declarations other than function declarations, or on
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c
index 2e70d12..9573837 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c
@@ -1,6 +1,6 @@
-/* Test C2x nodiscard attribute: invalid syntax.  */
+/* Test C23 nodiscard attribute: invalid syntax.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[nodiscard()]] int a (void); /* { dg-error "parentheses must be omitted if attribute argument list is empty" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c
index 278f55d..5add9de 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c
@@ -1,6 +1,6 @@
-/* Test C2x nodiscard attribute: duplicates (allowed after N2557).  */
+/* Test C23 nodiscard attribute: duplicates (allowed after N2557).  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[nodiscard, __nodiscard__]] int f (void);
 [[__nodiscard__, nodiscard("message")]] int g (void);
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c b/gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c
index d903c09..7142635 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c
@@ -1,6 +1,6 @@
-/* Test C2x noreturn attribute: valid uses.  */
+/* Test C23 noreturn attribute: valid uses.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[noreturn]] void exit (int);
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c b/gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c
index 331da4a..c6e0180 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c
@@ -1,6 +1,6 @@
-/* Test C2x noreturn attribute: invalid contexts.  */
+/* Test C23 noreturn attribute: invalid contexts.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[noreturn]]; /* { dg-error "ignored" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c b/gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c
index aaf21e2..a447b72 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c
@@ -1,6 +1,6 @@
-/* Test C2x noreturn attribute: invalid syntax.  */
+/* Test C23 noreturn attribute: invalid syntax.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[noreturn()]] void a(); /* { dg-error "does not take any arguments" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c
index 48e2591..9bca216 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c
@@ -1,7 +1,7 @@
-/* Test C2x attribute syntax.  Basic tests of valid uses of empty
+/* Test C23 attribute syntax.  Basic tests of valid uses of empty
    attributes.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [ [ ] ] [[]];
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c
index ceca950..36b6fc2 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c
@@ -1,6 +1,6 @@
-/* Test C2x attribute syntax.  Test ignored attributes diagnosed.  */
+/* Test C23 attribute syntax.  Test ignored attributes diagnosed.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* A GNU attribute that is valid in some contexts, but should be
    diagnosed in contexts where all attributes are ignored (attribute
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c
index 2f0d9f6..ffb7f11 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c
@@ -1,6 +1,6 @@
-/* Test C2x attribute syntax.  Invalid uses of attributes.  */
+/* Test C23 attribute syntax.  Invalid uses of attributes.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* Prefix attributes not allowed on declarations without declarators.  */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c
index 17d6108..312d75e 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c
@@ -1,6 +1,6 @@
-/* Test C23 attribute syntax: diagnosed with -Wc11-c2x-compat.  */
+/* Test C23 attribute syntax: diagnosed with -Wc11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 [[]]; /* { dg-warning "attributes before C23" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c
index b261be0..3088d02 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c
@@ -1,7 +1,7 @@
-/* Test C2x attribute syntax.  Test unknown standard attributes
+/* Test C23 attribute syntax.  Test unknown standard attributes
    diagnosed with a pedwarn.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 [[unknown_attribute]]; /* { dg-error "attribute ignored" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c b/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
index bccdcff..cf3b1ff 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
+++ b/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
@@ -1,6 +1,6 @@
 /* Test C23 attribute syntax: use of __extension__ in C11 mode.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 #define FOO ::
 #define BAR :
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-1.c b/gcc/testsuite/gcc.dg/c2x-auto-1.c
index c50dacc..fb3e845 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-auto-1.c
@@ -1,6 +1,6 @@
-/* Test C2x auto.  Valid code, compilation tests.  */
+/* Test C23 auto.  Valid code, compilation tests.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 auto i = 1;
 extern int i;
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-2.c b/gcc/testsuite/gcc.dg/c2x-auto-2.c
index a41f813..4318e99 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-auto-2.c
@@ -1,6 +1,6 @@
-/* Test C2x auto.  Valid code, execution tests.  Based on auto-type-1.c.  */
+/* Test C23 auto.  Valid code, execution tests.  Based on auto-type-1.c.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-require-effective-target alloca } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-3.c b/gcc/testsuite/gcc.dg/c2x-auto-3.c
index 1ab3cc7..ab94c7a 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-auto-3.c
@@ -1,6 +1,6 @@
-/* Test C2x auto.  Invalid code.  */
+/* Test C23 auto.  Invalid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 auto; /* { dg-error "empty declaration" } */
 auto *p = (int *) 0; /* { dg-error "plain identifier" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-4.c b/gcc/testsuite/gcc.dg/c2x-auto-4.c
index 3c6cb34..9dd0e08 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-auto-4.c
@@ -1,5 +1,5 @@
-/* Test C2x auto.  -Wc11-c2x-compat warning.  */
+/* Test C23 auto.  -Wc11-c23-compat warning.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 auto x = 2; /* { dg-warning "ISO C does not support 'auto' type deduction before" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-1.c b/gcc/testsuite/gcc.dg/c2x-binary-constants-1.c
index bbb2bc8..69b3f5d 100644
--- a/gcc/testsuite/gcc.dg/c2x-binary-constants-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-binary-constants-1.c
@@ -1,5 +1,5 @@
-/* Test C2x binary constants.  Valid syntax and types.  */
+/* Test C23 binary constants.  Valid syntax and types.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include "binary-constants-1.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-2.c b/gcc/testsuite/gcc.dg/c2x-binary-constants-2.c
index c64ede7..46727df 100644
--- a/gcc/testsuite/gcc.dg/c2x-binary-constants-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-binary-constants-2.c
@@ -1,6 +1,6 @@
 /* Test that binary constants are accepted in C23 mode: compat warnings.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 
 int a = 0b1; /* { dg-warning "C23 feature" } */
 #if 0b101 /* { dg-warning "C23 feature" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-3.c b/gcc/testsuite/gcc.dg/c2x-binary-constants-3.c
index 7604791f..ca80ea0 100644
--- a/gcc/testsuite/gcc.dg/c2x-binary-constants-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-binary-constants-3.c
@@ -1,6 +1,6 @@
-/* Test C2x binary constants.  Invalid constants.  */
+/* Test C23 binary constants.  Invalid constants.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int a = 0b; /* { dg-error "invalid suffix" } */
 int b = 0B2; /* { dg-error "invalid suffix" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-1.c b/gcc/testsuite/gcc.dg/c2x-bool-1.c
index 992fb31..6f56e03 100644
--- a/gcc/testsuite/gcc.dg/c2x-bool-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-bool-1.c
@@ -1,6 +1,6 @@
-/* Test macro expansions in <stdbool.h> in C2x.  */
+/* Test macro expansions in <stdbool.h> in C23.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdbool.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-2.c b/gcc/testsuite/gcc.dg/c2x-bool-2.c
index 4edb34e..a919d0b 100644
--- a/gcc/testsuite/gcc.dg/c2x-bool-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-bool-2.c
@@ -1,6 +1,6 @@
-/* Test bool, true and false keywords in C2x.  */
+/* Test bool, true and false keywords in C23.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-limits-1.c b/gcc/testsuite/gcc.dg/c2x-bool-limits-1.c
index d32b4ef..5343113 100644
--- a/gcc/testsuite/gcc.dg/c2x-bool-limits-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-bool-limits-1.c
@@ -1,6 +1,6 @@
-/* Test limits for _Bool in <limits.h> in C2x.  */
+/* Test limits for _Bool in <limits.h> in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <limits.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-builtins-1.c b/gcc/testsuite/gcc.dg/c2x-builtins-1.c
index 7476059..39f0ea4 100644
--- a/gcc/testsuite/gcc.dg/c2x-builtins-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-builtins-1.c
@@ -1,7 +1,7 @@
-/* Test C2x built-in functions: test functions new in C2x are indeed
+/* Test C23 built-in functions: test functions new in C23 are indeed
    declared as built-in as expected.  Non-DFP tests.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 int exp10 (void); /* { dg-warning "conflicting types for built-in function" } */
 int exp10f (void); /* { dg-warning "conflicting types for built-in function" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-1.c b/gcc/testsuite/gcc.dg/c2x-complit-1.c
index af92d4d..c259d62 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-1.c
@@ -1,6 +1,6 @@
-/* Test storage duration of compound literals in parameter lists for C2x.  */
+/* Test storage duration of compound literals in parameter lists for C23.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-2.c b/gcc/testsuite/gcc.dg/c2x-complit-2.c
index dcca5e8..720b958 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-2.c
@@ -1,6 +1,6 @@
-/* Test C2x storage class specifiers in compound literals.  */
+/* Test C23 storage class specifiers in compound literals.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stddef.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-3.c b/gcc/testsuite/gcc.dg/c2x-complit-3.c
index c672525..310c142 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-3.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals.  Thread-local
+/* Test C23 storage class specifiers in compound literals.  Thread-local
    cases, compilation tests.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-require-effective-target tls } */
 
 #include <stddef.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-4.c b/gcc/testsuite/gcc.dg/c2x-complit-4.c
index 31d7413..22ec19c 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-4.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals.  Thread-local
+/* Test C23 storage class specifiers in compound literals.  Thread-local
    cases, execution tests.  */
 /* { dg-do run } */
-/* { dg-options "-pthread -std=gnu2x -pedantic-errors" } */
+/* { dg-options "-pthread -std=gnu23 -pedantic-errors" } */
 /* { dg-require-effective-target pthread_h } */
 /* { dg-require-effective-target pthread } */
 /* { dg-require-effective-target tls_runtime } */
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-5.c b/gcc/testsuite/gcc.dg/c2x-complit-5.c
index 1eb0f8d..27adb17 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-5.c
@@ -1,6 +1,6 @@
-/* Test C2x storage class specifiers in compound literals: invalid code.  */
+/* Test C23 storage class specifiers in compound literals: invalid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int *p = &(register int) { 0 }; /* { dg-error "file-scope compound literal specifies" } */
 
@@ -34,7 +34,7 @@ g ()
 void
 h ()
 {
-  /* The following cases are not part of the C2x syntax, but are detected
+  /* The following cases are not part of the C23 syntax, but are detected
      specially by the parser.  */
   (static int) 0; /* { dg-error "storage class specifier in cast" } */
   sizeof (static int); /* { dg-error "storage class specifier in" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-6.c b/gcc/testsuite/gcc.dg/c2x-complit-6.c
index 23a0bb6..53a7abf7 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-6.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals diagnosed with
-   -Wc11-c2x-compat.  */
+/* Test C23 storage class specifiers in compound literals diagnosed with
+   -Wc11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 
 int *ps = &(static int) { 1 }; /* { dg-warning "forbids storage class specifiers in compound literals" } */
 int ss = sizeof (static int) { 1 }; /* { dg-warning "forbids storage class specifiers in compound literals" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-7.c b/gcc/testsuite/gcc.dg/c2x-complit-7.c
index 0cd0b86..1fca226 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-7.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-7.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals diagnosed with
-   -Wc11-c2x-compat, but not errors with -pedantic-errors.  */
+/* Test C23 storage class specifiers in compound literals diagnosed with
+   -Wc11-c23-compat, but not errors with -pedantic-errors.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat -pedantic-errors" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat -pedantic-errors" } */
 
 int *ps = &(static int) { 1 }; /* { dg-warning "forbids storage class specifiers in compound literals" } */
 int ss = sizeof (static int) { 1 }; /* { dg-warning "forbids storage class specifiers in compound literals" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-8.c b/gcc/testsuite/gcc.dg/c2x-complit-8.c
index fb614ab..56eb665 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-8.c
+++ b/gcc/testsuite/gcc.dg/c2x-complit-8.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals: inline function
+/* Test C23 storage class specifiers in compound literals: inline function
    constraints.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 inline void
 f1 ()
diff --git a/gcc/testsuite/gcc.dg/c2x-concat-1.c b/gcc/testsuite/gcc.dg/c2x-concat-1.c
index e92eaaf..8b4c890 100644
--- a/gcc/testsuite/gcc.dg/c2x-concat-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-concat-1.c
@@ -1,6 +1,6 @@
 /* Test errors for bad string literal concatenation.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 void *pLU = L"" U""; /* { dg-error "non-standard concatenation" } */
 void *pL_U = L"" "" U""; /* { dg-error "non-standard concatenation" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-1.c b/gcc/testsuite/gcc.dg/c2x-constexpr-1.c
index 8989530..e7eaf3d 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-1.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code, compilation tests.  */
+/* Test C23 constexpr.  Valid code, compilation tests.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c b/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c
index f74e2ec..0989df4 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code, execution test.  */
+/* Test C23 constexpr.  Valid code, execution test.  */
 /* { dg-do link } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-additional-sources "c2x-constexpr-2b.c" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-2b.c b/gcc/testsuite/gcc.dg/c2x-constexpr-2b.c
index 04058b3..bcdff32 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-2b.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-2b.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Second file for link test.  */
+/* Test C23 constexpr.  Second file for link test.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* constexpr objects at file scope have internal linkage.  */
 constexpr int a = 3;
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-3.c b/gcc/testsuite/gcc.dg/c2x-constexpr-3.c
index b9b780e..1429b12 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-3.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Invalid code.  */
+/* Test C23 constexpr.  Invalid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 extern constexpr int v0 = 0; /* { dg-error "'constexpr' used with 'extern'" } */
 /* { dg-warning "initialized and declared 'extern'" "initialized extern" { target *-*-* } .-1 } */
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-4.c b/gcc/testsuite/gcc.dg/c2x-constexpr-4.c
index 2a42af8..d4d6091 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-4.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code, compilation tests, signed char.  */
+/* Test C23 constexpr.  Valid code, compilation tests, signed char.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -fsigned-char" } */
+/* { dg-options "-std=c23 -pedantic-errors -fsigned-char" } */
 
 constexpr char v1[] = "\x00\xff";
 constexpr signed char v2[] = "\x7f\x80";
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-5.c b/gcc/testsuite/gcc.dg/c2x-constexpr-5.c
index 6febd2e..5899ca1 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-5.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code, compilation tests, unsigned char.  */
+/* Test C23 constexpr.  Valid code, compilation tests, unsigned char.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -funsigned-char" } */
+/* { dg-options "-std=c23 -pedantic-errors -funsigned-char" } */
 
 constexpr char v1[] = "\x00\xff";
 constexpr signed char v2[] = "\x7f\x00";
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-6.c b/gcc/testsuite/gcc.dg/c2x-constexpr-6.c
index a86124a..a52851f 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-6.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Invalid code, compilation tests, signed char.  */
+/* Test C23 constexpr.  Invalid code, compilation tests, signed char.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -fsigned-char" } */
+/* { dg-options "-std=c23 -pedantic-errors -fsigned-char" } */
 
 constexpr unsigned char v3[] = "\x00\xff"; /* { dg-error "'constexpr' initializer not representable in type of object" } */
 constexpr char v4[] = u8"\x00\xff"; /* { dg-error "'constexpr' initializer not representable in type of object" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-7.c b/gcc/testsuite/gcc.dg/c2x-constexpr-7.c
index 5282d92..0c3101e 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-7.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-7.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Invalid code, compilation tests, unsigned char.  */
+/* Test C23 constexpr.  Invalid code, compilation tests, unsigned char.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -funsigned-char" } */
+/* { dg-options "-std=c23 -pedantic-errors -funsigned-char" } */
 
 constexpr signed char v2[] = "\x00\xff"; /* { dg-error "'constexpr' initializer not representable in type of object" } */
 constexpr signed char v5[] = u8"\x00\xff"; /* { dg-error "'constexpr' initializer not representable in type of object" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-8.c b/gcc/testsuite/gcc.dg/c2x-constexpr-8.c
index 11372cf..02c039b 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-8.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-8.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code, compilation tests, IEEE arithmetic.  */
+/* Test C23 constexpr.  Valid code, compilation tests, IEEE arithmetic.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target inff } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-9.c b/gcc/testsuite/gcc.dg/c2x-constexpr-9.c
index 8a07ed5..1370583 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-9.c
+++ b/gcc/testsuite/gcc.dg/c2x-constexpr-9.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Invalid code, compilation tests, IEEE arithmetic.  */
+/* Test C23 constexpr.  Invalid code, compilation tests, IEEE arithmetic.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target inff } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-1.c b/gcc/testsuite/gcc.dg/c2x-digit-separators-1.c
index 6eadf2e..4b5f4f6 100644
--- a/gcc/testsuite/gcc.dg/c2x-digit-separators-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-digit-separators-1.c
@@ -1,6 +1,6 @@
-/* Test C2x digit separators.  Valid usages.  */
+/* Test C23 digit separators.  Valid usages.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 _Static_assert (123'45'6 == 123456);
 _Static_assert (0'123 == 0123);
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-2.c b/gcc/testsuite/gcc.dg/c2x-digit-separators-2.c
index d72f8ad..30a9eb5 100644
--- a/gcc/testsuite/gcc.dg/c2x-digit-separators-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-digit-separators-2.c
@@ -1,6 +1,6 @@
-/* Test C2x digit separators.  Invalid usages.  */
+/* Test C23 digit separators.  Invalid usages.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 void
 tf (void)
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-3.c b/gcc/testsuite/gcc.dg/c2x-digit-separators-3.c
index cddb88f..e4d850f 100644
--- a/gcc/testsuite/gcc.dg/c2x-digit-separators-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-digit-separators-3.c
@@ -1,7 +1,7 @@
-/* Test C2x digit separators.  Test token pasting avoided for preprocessed
+/* Test C23 digit separators.  Test token pasting avoided for preprocessed
    output.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -save-temps" } */
+/* { dg-options "-std=c23 -save-temps" } */
 
 #define ZERO 0
 
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-1.c b/gcc/testsuite/gcc.dg/c2x-empty-init-1.c
index 1487a2b..df0b007 100644
--- a/gcc/testsuite/gcc.dg/c2x-empty-init-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-empty-init-1.c
@@ -1,6 +1,6 @@
-/* Test C2X support for empty initializers: valid use cases.  */
+/* Test C23 support for empty initializers: valid use cases.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 extern void exit (int);
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-2.c b/gcc/testsuite/gcc.dg/c2x-empty-init-2.c
index 0dc81ce..84a9e65 100644
--- a/gcc/testsuite/gcc.dg/c2x-empty-init-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-empty-init-2.c
@@ -1,6 +1,6 @@
-/* Test C2X support for empty initializers: invalid use cases.  */
+/* Test C23 support for empty initializers: invalid use cases.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* Empty initialization is invalid for arrays of unknown size.  This is
    diagnosed via the diagnostic for zero-size arrays.  */
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-3.c b/gcc/testsuite/gcc.dg/c2x-empty-init-3.c
index 472f816..6a14421 100644
--- a/gcc/testsuite/gcc.dg/c2x-empty-init-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-empty-init-3.c
@@ -1,6 +1,6 @@
-/* Test empty initializers diagnosed in C2X mode with -Wc11-c2x-compat.  */
+/* Test empty initializers diagnosed in C23 mode with -Wc11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 
 struct s { int a; };
 struct s s = {}; /* { dg-warning "empty initializer" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-1.c b/gcc/testsuite/gcc.dg/c2x-enum-1.c
index 984a4e7..3bf32b6 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-1.c
@@ -1,6 +1,6 @@
-/* Test C2x enumerations with values not representable in int.  */
+/* Test C23 enumerations with values not representable in int.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* Check a type while defining an enum (via a diagnostic for incompatible
    pointer types if the wrong type was chosen).  */
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-2.c b/gcc/testsuite/gcc.dg/c2x-enum-2.c
index 15dcf9a..43cc8f8 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-2.c
@@ -1,8 +1,8 @@
-/* Test C2x enumerations with values not representable in int.  Test values
+/* Test C23 enumerations with values not representable in int.  Test values
    outside the range of standard or extended integer types are diagnosed, even
    when they can be represented in __int128.  */
 /* { dg-do compile { target int128 } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 enum e1 { e1a = __LONG_LONG_MAX__, e1b }; /* { dg-error "enumerator value outside the range" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-3.c b/gcc/testsuite/gcc.dg/c2x-enum-3.c
index 532d977..191001d 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-3.c
@@ -1,8 +1,8 @@
-/* Test C2x enumerations with values not representable in int.  Test values
+/* Test C23 enumerations with values not representable in int.  Test values
    outside the range of standard or extended integer types are diagnosed,
    when __int128 is unsupported.  */
 /* { dg-do compile { target { ! int128 } } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 enum e1 { e1a = __LONG_LONG_MAX__, e1b }; /* { dg-error "overflow in enumeration values" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-4.c b/gcc/testsuite/gcc.dg/c2x-enum-4.c
index c2e58bf..3d1f51b 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-4.c
@@ -1,7 +1,7 @@
-/* Test C2x enumerations with values not representable in int.  Test overflow
+/* Test C23 enumerations with values not representable in int.  Test overflow
    of __int128 is diagnosed.  */
 /* { dg-do compile { target { int128 } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 enum e1 { e1a = (__int128) (((unsigned __int128) -1) >> 1), e1b }; /* { dg-error "overflow in enumeration values" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-5.c b/gcc/testsuite/gcc.dg/c2x-enum-5.c
index a4290f0..f39b1d2 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-5.c
@@ -1,7 +1,7 @@
-/* Test C2x enumerations with values not representable in int.  Test
-   -Wc11-c2x-compat warnings.  */
+/* Test C23 enumerations with values not representable in int.  Test
+   -Wc11-c23-compat warnings.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 enum e1 { e1a = -__LONG_LONG_MAX__ - 1 }; /* { dg-warning "ISO C restricts enumerator values" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-6.c b/gcc/testsuite/gcc.dg/c2x-enum-6.c
index 5ab9694..976dcc6 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-6.c
@@ -1,6 +1,6 @@
-/* Test C2x enumerations with fixed underlying type.  Valid code.  */
+/* Test C23 enumerations with fixed underlying type.  Valid code.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* Check a type while defining an enum (via a diagnostic for incompatible
    pointer types if the wrong type was chosen).  */
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-7.c b/gcc/testsuite/gcc.dg/c2x-enum-7.c
index 08bae31..c9ef088 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-7.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-7.c
@@ -1,6 +1,6 @@
-/* Test C2x enumerations with fixed underlying type.  Invalid code.  */
+/* Test C23 enumerations with fixed underlying type.  Invalid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* An enum type specifier may only be used when the enum is defined, or in a
    declaration of the form "enum name enum-type-specifier;".  */
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-8.c b/gcc/testsuite/gcc.dg/c2x-enum-8.c
index f7757fc..a241a3f 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-8.c
+++ b/gcc/testsuite/gcc.dg/c2x-enum-8.c
@@ -1,7 +1,7 @@
-/* Test C2x enumerations with fixed underlying type.  Test -Wc11-c2x-compat
+/* Test C23 enumerations with fixed underlying type.  Test -Wc11-c23-compat
    warnings.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 enum e1 : int; /* { dg-warning "ISO C does not support specifying 'enum' underlying types before" } */
 enum e2 : short { E2 }; /* { dg-warning "ISO C does not support specifying 'enum' underlying types before" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-float-1.c b/gcc/testsuite/gcc.dg/c2x-float-1.c
index 8df85f9..c13ad0d 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-1.c
@@ -1,6 +1,6 @@
 /* Test *_NORM_MAX macros.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-10.c b/gcc/testsuite/gcc.dg/c2x-float-10.c
index 7206921..d3d0359 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-10.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-10.c
@@ -1,6 +1,6 @@
 /* Test *_IS_IEC_60559 macros.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-11.c b/gcc/testsuite/gcc.dg/c2x-float-11.c
index 0e2f3c0..17f42da 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-11.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-11.c
@@ -1,6 +1,6 @@
 /* Test INFINITY macro.  Test when infinities not supported.  */
 /* { dg-do compile { target { ! inff } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-12.c b/gcc/testsuite/gcc.dg/c2x-float-12.c
index 40900bd..04b3f05 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-12.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-12.c
@@ -1,6 +1,6 @@
-/* Test C2x definition of LDBL_EPSILON.  */
+/* Test C23 definition of LDBL_EPSILON.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-13.c b/gcc/testsuite/gcc.dg/c2x-float-13.c
index dc54bc7..9cfd7f0 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-13.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-13.c
@@ -1,6 +1,6 @@
-/* Test __STDC_VERSION_FLOAT_H__ in C2x.  */
+/* Test __STDC_VERSION_FLOAT_H__ in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-2.c b/gcc/testsuite/gcc.dg/c2x-float-2.c
index 61a77f6..65f3b59 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-2.c
@@ -1,6 +1,6 @@
 /* Test INFINITY macro.  Generic test.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -w" } */
+/* { dg-options "-std=c23 -w" } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target inff } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-3.c b/gcc/testsuite/gcc.dg/c2x-float-3.c
index 7c6298b..23ab80f 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-3.c
@@ -1,6 +1,6 @@
 /* Test INFINITY macro.  Test when infinities supported.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target inff } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-4.c b/gcc/testsuite/gcc.dg/c2x-float-4.c
index bca8435..b4af9d3 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-4.c
@@ -1,6 +1,6 @@
 /* Test NAN macro.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options ieee } */
 
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-5.c b/gcc/testsuite/gcc.dg/c2x-float-5.c
index 477f9cf..9c2f1bd 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-5.c
@@ -2,7 +2,7 @@
    not signaling.  */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-6.c b/gcc/testsuite/gcc.dg/c2x-float-6.c
index 573540b..541fcd6 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-6.c
@@ -1,6 +1,6 @@
 /* Test SNAN macros.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors -fsignaling-nans" } */
+/* { dg-options "-std=c23 -pedantic-errors -fsignaling-nans" } */
 /* { dg-add-options ieee } */
 
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7a.c b/gcc/testsuite/gcc.dg/c2x-float-7a.c
index 129e790..3054949 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-7a.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-7a.c
@@ -2,7 +2,7 @@
    signaling.  */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions } */
-/* { dg-options "-std=c2x -pedantic-errors -fsignaling-nans" } */
+/* { dg-options "-std=c23 -pedantic-errors -fsignaling-nans" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7b.c b/gcc/testsuite/gcc.dg/c2x-float-7b.c
index 0ae9038..0075407 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-7b.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-7b.c
@@ -2,7 +2,7 @@
    signaling.  */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions_double } */
-/* { dg-options "-std=c2x -pedantic-errors -fsignaling-nans" } */
+/* { dg-options "-std=c23 -pedantic-errors -fsignaling-nans" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7c.c b/gcc/testsuite/gcc.dg/c2x-float-7c.c
index 038fd55..b7455d9 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-7c.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-7c.c
@@ -2,7 +2,7 @@
    signaling.  */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions_long_double } */
-/* { dg-options "-std=c2x -pedantic-errors -fsignaling-nans" } */
+/* { dg-options "-std=c23 -pedantic-errors -fsignaling-nans" } */
 /* { dg-add-options ieee } */
 
 #include <fenv.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-8.c b/gcc/testsuite/gcc.dg/c2x-float-8.c
index b10cb85..a1b141b 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-8.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-8.c
@@ -1,7 +1,7 @@
 /* Test including <math.h> then <float.h> does not result in errors
    from duplicate NAN and INFINITY macros.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <math.h>
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-9.c b/gcc/testsuite/gcc.dg/c2x-float-9.c
index 0a54bc2..eeb17d7 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-9.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-9.c
@@ -1,7 +1,7 @@
 /* Test including <float.h> then <math.h> does not result in errors
    from duplicate NAN and INFINITY macros.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <float.h>
 #include <math.h>
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
index 73610c8..d6fa003 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
@@ -1,6 +1,6 @@
 /* Test DFP macros not defined in <float.h> if no DFP support.  */
 /* { dg-do compile { target { ! dfp } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
index 730ce89..25a2a97 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
@@ -1,7 +1,7 @@
 /* Test DFP macros not defined in <float.h> if no DFP support.  Test
    with feature test macros defined.  */
 /* { dg-do compile { target { ! dfp } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #define __STDC_WANT_DEC_FP__
 #define __STDC_WANT_IEC_60559_DFP_EXT__
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c
index aa790c8..3923649 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c
@@ -1,7 +1,7 @@
 /* Test DFP macros not defined in <float.h> if no DFP support.
    Infinity and NaN macros.  */
 /* { dg-do compile { target { ! dfp } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c
index 855922a..8518c0a 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c
@@ -2,7 +2,7 @@
    Infinity and NaN macros.  Test with feature test macros
    defined.  */
 /* { dg-do compile { target { ! dfp } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #define __STDC_WANT_DEC_FP__
 #define __STDC_WANT_IEC_60559_DFP_EXT__
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-1.c b/gcc/testsuite/gcc.dg/c2x-floatn-1.c
index d999849..0084a0c 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options float32 } */
 /* { dg-add-options float64 } */
 /* { dg-add-options float32x } */
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-2.c b/gcc/testsuite/gcc.dg/c2x-floatn-2.c
index 1793645..808438a 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options float128 } */
 /* { dg-require-effective-target float128 } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-3.c b/gcc/testsuite/gcc.dg/c2x-floatn-3.c
index 9ac133cc..0c12380 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options float16 } */
 /* { dg-require-effective-target float16 } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-4.c b/gcc/testsuite/gcc.dg/c2x-floatn-4.c
index 5d3ab24..b1a21a0 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-add-options float64x } */
 /* { dg-require-effective-target float64x } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-5.c b/gcc/testsuite/gcc.dg/c2x-floatn-5.c
index 2fb7798..66d4541 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 /* { dg-add-options float32 } */
 /* { dg-add-options float64 } */
 /* { dg-add-options float32x } */
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-6.c b/gcc/testsuite/gcc.dg/c2x-floatn-6.c
index 9959e70..3480e90 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 /* { dg-add-options float128 } */
 /* { dg-require-effective-target float128 } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-7.c b/gcc/testsuite/gcc.dg/c2x-floatn-7.c
index 517eb6b..5a1acb1 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-7.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-7.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 /* { dg-add-options float16 } */
 /* { dg-require-effective-target float16 } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-8.c b/gcc/testsuite/gcc.dg/c2x-floatn-8.c
index 6e42cc3..ed6ac9b 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-8.c
+++ b/gcc/testsuite/gcc.dg/c2x-floatn-8.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 /* { dg-add-options float64x } */
 /* { dg-require-effective-target float64x } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-1.c b/gcc/testsuite/gcc.dg/c2x-fordecl-1.c
index 563186f..2dc670c 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-fordecl-1.c
@@ -1,6 +1,6 @@
 /* Test restrictions on the kind of declarations permitted in for loops removed
-   in C2X.  */
+   in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include "c99-fordecl-2.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-2.c b/gcc/testsuite/gcc.dg/c2x-fordecl-2.c
index 4250190..cd6c6ea 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-fordecl-2.c
@@ -1,6 +1,6 @@
 /* Test restrictions on the kind of declarations permitted in for loops removed
-   in C2X.  */
+   in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include "c99-fordecl-3.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-3.c b/gcc/testsuite/gcc.dg/c2x-fordecl-3.c
index d39d4a6..03849fb 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-fordecl-3.c
@@ -1,7 +1,7 @@
 /* Test for C99 declarations in for loops.  Test constraints are diagnosed with
-   -Wc11-c2x-compat for C2X.  Based on c99-fordecl-2.c.  */
+   -Wc11-c23-compat for C23.  Based on c99-fordecl-2.c.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 void
 foo (void)
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-4.c b/gcc/testsuite/gcc.dg/c2x-fordecl-4.c
index e9dfc4b..09ae3b4 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-fordecl-4.c
@@ -1,8 +1,8 @@
 /* Test for C99 declarations in for loops.  Test constraints are diagnosed with
-   -Wc11-c2x-compat for C2X: struct and union tags can't be declared there
+   -Wc11-c23-compat for C23: struct and union tags can't be declared there
    (affirmed in response to DR#277).  Based on c99-fordecl-3.c.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 void
 foo (void)
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c
index fe06abf..b0adeaa 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c
@@ -1,6 +1,6 @@
 /* Test __has_c_attribute.  Test basic properties.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #ifdef __has_c_attribute
 /* OK.  */
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c
index dc92b95..3c5810a 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c
@@ -1,6 +1,6 @@
 /* Test __has_c_attribute.  Test supported attributes.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #if __has_c_attribute ( nodiscard ) != 202311L
 #error "bad result for nodiscard"
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c
index 36842ed..cd1a000 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c
@@ -1,6 +1,6 @@
 /* Test __has_c_attribute.  Test GNU attributes.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #if __has_c_attribute (gnu::packed) != 1
 #error "bad result for gnu::packed"
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c
index acd35d2..72e7ee3 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c
@@ -1,6 +1,6 @@
 /* Test __has_c_attribute.  Test syntax errors.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #if __has_c_attribute /* { dg-error "missing '\\('" } */
 #endif
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-1.c b/gcc/testsuite/gcc.dg/c2x-labels-1.c
index 439cf78..0d9b663 100644
--- a/gcc/testsuite/gcc.dg/c2x-labels-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-labels-1.c
@@ -1,6 +1,6 @@
 /* Tests for labels before declarations and at ends of compound statements.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int f(int x) 
 { 
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-2.c b/gcc/testsuite/gcc.dg/c2x-labels-2.c
index bd010e9e..ceef503 100644
--- a/gcc/testsuite/gcc.dg/c2x-labels-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-labels-2.c
@@ -1,6 +1,6 @@
 /* Tests for labels before declarations and at ends of compound statements.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 
 int f(int x) 
 { 
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-3.c b/gcc/testsuite/gcc.dg/c2x-labels-3.c
index 159116d..2d75e34 100644
--- a/gcc/testsuite/gcc.dg/c2x-labels-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-labels-3.c
@@ -1,7 +1,7 @@
 /* Tests for labels before declarations and at ends of compound statements
  * in combination with attributes. */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wall" } */
+/* { dg-options "-std=c23 -Wall" } */
 
 int f(void) 
 { 
diff --git a/gcc/testsuite/gcc.dg/c2x-limits-1.c b/gcc/testsuite/gcc.dg/c2x-limits-1.c
index 4977faf..58b5bdf 100644
--- a/gcc/testsuite/gcc.dg/c2x-limits-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-limits-1.c
@@ -1,6 +1,6 @@
-/* Test __STDC_VERSION_LIMITS_H__ in C2x.  */
+/* Test __STDC_VERSION_LIMITS_H__ in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <limits.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-no-dfp-1.c b/gcc/testsuite/gcc.dg/c2x-no-dfp-1.c
index 2cfbb6c..10ed491 100644
--- a/gcc/testsuite/gcc.dg/c2x-no-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-no-dfp-1.c
@@ -1,7 +1,7 @@
 /* Test DFP types and constants rejected if no DFP support.  Bug
    91985.  */
 /* { dg-do compile { target { ! dfp } } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 _Decimal32 d32a; /* { dg-error "not supported" } */
 _Decimal64 d64a; /* { dg-error "not supported" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-1.c b/gcc/testsuite/gcc.dg/c2x-nullptr-1.c
index 97a31c2..a1b9dea 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-nullptr-1.c
@@ -1,7 +1,7 @@
 /* Test valid usage of C23 nullptr.  */
 /* { dg-do run } */
 // { dg-require-effective-target thread_fence }
-/* { dg-options "-std=c2x -pedantic-errors -Wall -Wextra -Wno-unused-variable" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wall -Wextra -Wno-unused-variable" } */
 
 #include <stdarg.h>
 
@@ -156,7 +156,7 @@ test2 (int *p)
   (void) (_Generic(0, int : nullptr) != p);
 
   /* "(nullptr_t)nullptr" has type nullptr_t but isn't an NPC; these
-     comparisons are valid after C2X CD comments GB-071 and FR-073 were
+     comparisons are valid after C23 CD comments GB-071 and FR-073 were
      resolved by the wording in N3077.  */
   (void) ((nullptr_t)nullptr == p);
   (void) ((nullptr_t)nullptr != p);
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-2.c b/gcc/testsuite/gcc.dg/c2x-nullptr-2.c
index b610565..d7e4294 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-nullptr-2.c
@@ -1,6 +1,6 @@
 /* Test nullptr_t from <stddef.h>.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stddef.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-3.c b/gcc/testsuite/gcc.dg/c2x-nullptr-3.c
index 09d9856..f700624 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-nullptr-3.c
@@ -1,6 +1,6 @@
 /* Test wrong usage of C23 nullptr.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wall -Wextra -Wno-unused-variable" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wall -Wextra -Wno-unused-variable" } */
 
 typedef __typeof__(nullptr) nullptr_t;
 
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-4.c b/gcc/testsuite/gcc.dg/c2x-nullptr-4.c
index a5aa1cd..578f999 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-nullptr-4.c
@@ -1,7 +1,7 @@
-/* Test that -Wc11-c2x-compat issues a warning (not a pedwarn) about
+/* Test that -Wc11-c23-compat issues a warning (not a pedwarn) about
    `nullptr' in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 int *
 fn (int *p)
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-5.c b/gcc/testsuite/gcc.dg/c2x-nullptr-5.c
index 27803f7..54266af 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-nullptr-5.c
@@ -1,6 +1,6 @@
 /* Test that we don't lose side-effects when converting from nullptr_t.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int i;
 nullptr_t fn () { ++i; return nullptr; }
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-6.c b/gcc/testsuite/gcc.dg/c2x-nullptr-6.c
index 24e14fa..2ee2202 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-nullptr-6.c
@@ -1,5 +1,5 @@
 /* PR c/108424 */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 struct S {
   int i;
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c b/gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c
index c775366..f204a3a 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c
@@ -1,6 +1,6 @@
-/* Test old-style function definitions not in C2x: warnings.  */
+/* Test old-style function definitions not in C23: warnings.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 void
 f (x) /* { dg-warning "old-style function definition" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c b/gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c
index 7bd5a60..eae68a8 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c
@@ -1,6 +1,6 @@
-/* Test old-style function definitions not in C2x: errors.  */
+/* Test old-style function definitions not in C23: errors.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 void
 f (x) /* { dg-error "old-style function definition" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c b/gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c
index a250076..9a880bc 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c
@@ -1,7 +1,7 @@
-/* Test old-style function definitions not in C2x: warnings disabled
+/* Test old-style function definitions not in C23: warnings disabled
    by -Wno-old-style-definition.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wno-old-style-definition" } */
+/* { dg-options "-std=c23 -Wno-old-style-definition" } */
 
 void
 f (x)
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c b/gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c
index b1862b1..516efd0 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c
@@ -1,7 +1,7 @@
-/* Test old-style function definitions not in C2x: () gives type with
+/* Test old-style function definitions not in C23: () gives type with
    a prototype.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 void
 f ()
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c b/gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c
index 0c37a06..b0cf4ac 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c
@@ -1,7 +1,7 @@
-/* Test old-style function definitions not in C2x: () does not warn
+/* Test old-style function definitions not in C23: () does not warn
    with -Wold-style-definition.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wold-style-definition" } */
+/* { dg-options "-std=c23 -Wold-style-definition" } */
 
 void
 f ()
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c b/gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c
index 72bfd56..4542034 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c
@@ -1,7 +1,7 @@
-/* Test old-style function definitions not in C2x: () gives a type with
+/* Test old-style function definitions not in C23: () gives a type with
    a prototype for all declarations.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 void f1 (); /* { dg-message "declared here" } */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-1.c b/gcc/testsuite/gcc.dg/c2x-parm-omit-1.c
index 0dc89bb..64e70b9 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-parm-omit-1.c
@@ -1,5 +1,5 @@
-/* Test omitted parameter names in C2x.  */
+/* Test omitted parameter names in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 void f (int) { }
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-2.c b/gcc/testsuite/gcc.dg/c2x-parm-omit-2.c
index 7d68933..6ec44da 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-parm-omit-2.c
@@ -1,7 +1,7 @@
-/* Test omitted parameter names in C2x.  Warning test: there should be
+/* Test omitted parameter names in C23.  Warning test: there should be
    no warning for an unnamed parameter being unused.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wall -Wextra" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wall -Wextra" } */
 
 int
 f (int a, int, int c, int d) /* { dg-warning "unused parameter 'd'" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-3.c b/gcc/testsuite/gcc.dg/c2x-parm-omit-3.c
index dac258b..6e48410 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-parm-omit-3.c
@@ -1,6 +1,6 @@
-/* Test omitted parameter names in C2x.  Execution test.  */
+/* Test omitted parameter names in C23.  Execution test.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-4.c b/gcc/testsuite/gcc.dg/c2x-parm-omit-4.c
index a4b0deb..8063bdd 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-parm-omit-4.c
@@ -1,5 +1,5 @@
-/* Test omitted parameter names in C2x: diagnosed with -Wc11-c2x-compat.  */
+/* Test omitted parameter names in C23: diagnosed with -Wc11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 void f (int) { } /* { dg-warning "omitting parameter names" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-1.c b/gcc/testsuite/gcc.dg/c2x-qual-1.c
index 4d33db1..52ae87a 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-qual-1.c
@@ -1,8 +1,8 @@
-/* Tests related to qualifiers and pointers to arrays in C2X, PR98397 */
+/* Tests related to qualifiers and pointers to arrays in C23, PR98397 */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
-/* test that qualifiers are preserved in tertiary operator for pointers to arrays in C2X */
+/* test that qualifiers are preserved in tertiary operator for pointers to arrays in C23 */
 
 void f(void)
 {
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-2.c b/gcc/testsuite/gcc.dg/c2x-qual-2.c
index 0bdb203..250776d 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-qual-2.c
@@ -1,6 +1,6 @@
 /* Tests related to qualifiers and pointers to arrays in C23, PR98397 */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 
 /* test that qualifiers are preserved in tertiary operator for pointers to arrays in C23 */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-3.c b/gcc/testsuite/gcc.dg/c2x-qual-3.c
index 4328cfb..5afdcfd 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-qual-3.c
@@ -1,6 +1,6 @@
 /* Tests related to qualifiers and pointers to arrays in C23, PR98397 */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat -pedantic-errors" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat -pedantic-errors" } */
 
 /* test that qualifiers are preserved in tertiary operator for pointers to arrays in C23 */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-4.c b/gcc/testsuite/gcc.dg/c2x-qual-4.c
index 93b4723..8a7a9f2 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-qual-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 void tvoid(void* x);
 void transpose0(double* out, const double* in) { }
 void transpose1(double out[2][2], const double in[2][2]) { }
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-5.c b/gcc/testsuite/gcc.dg/c2x-qual-5.c
index 0801fa0..89b541a 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-qual-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 void tvoid(void* x);
 void transpose0(double* out, const double* in) { }
 void transpose1(double out[2][2], const double in[2][2]) { }
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-6.c b/gcc/testsuite/gcc.dg/c2x-qual-6.c
index ef23316..d79423c 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-6.c
+++ b/gcc/testsuite/gcc.dg/c2x-qual-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat -pedantic-errors" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat -pedantic-errors" } */
 void tvoid(void* x);
 void transpose0(double* out, const double* in) { }
 void transpose1(double out[2][2], const double in[2][2]) { }
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-7.c b/gcc/testsuite/gcc.dg/c2x-qual-7.c
index 5fe15e1..d18fc34 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-7.c
+++ b/gcc/testsuite/gcc.dg/c2x-qual-7.c
@@ -1,8 +1,8 @@
-/* Tests related to qualifiers and pointers to arrays in C2X, PR98397 */
+/* Tests related to qualifiers and pointers to arrays in C23, PR98397 */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
-/* test that _Atomic qualifier is not preserved in tertiary operator for pointers to arrays in C2X */
+/* test that _Atomic qualifier is not preserved in tertiary operator for pointers to arrays in C23 */
 
 void f(void)
 {
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-1.c b/gcc/testsuite/gcc.dg/c2x-static-assert-1.c
index 1b771a1..c3405e8 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-static-assert-1.c
@@ -1,5 +1,5 @@
-/* Test C2x static assertions.  Omitting the string supported.  */
+/* Test C23 static assertions.  Omitting the string supported.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic" } */
+/* { dg-options "-std=c23 -pedantic" } */
 
 _Static_assert (1);
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-2.c b/gcc/testsuite/gcc.dg/c2x-static-assert-2.c
index c347467..7533985 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-static-assert-2.c
@@ -1,6 +1,6 @@
-/* Test C2x static assertions.  Omitting the string supported.  Failed
+/* Test C23 static assertions.  Omitting the string supported.  Failed
    assertions.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic" } */
+/* { dg-options "-std=c23 -pedantic" } */
 
 _Static_assert (0); /* { dg-error "static assertion failed" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-3.c b/gcc/testsuite/gcc.dg/c2x-static-assert-3.c
index 5d84a6a..d6b1188 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-static-assert-3.c
@@ -1,6 +1,6 @@
-/* Test C2x static assertions.  static_assert keyword.  */
+/* Test C23 static assertions.  static_assert keyword.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic" } */
+/* { dg-options "-std=c23 -pedantic" } */
 
 static_assert (1);
 static_assert (1, "message");
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-4.c b/gcc/testsuite/gcc.dg/c2x-static-assert-4.c
index b3bcfb4..12744eb 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-static-assert-4.c
@@ -1,6 +1,6 @@
-/* Test C2x static assertions.  static_assert keyword.  Failed assertions.  */
+/* Test C23 static assertions.  static_assert keyword.  Failed assertions.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic" } */
+/* { dg-options "-std=c23 -pedantic" } */
 
 static_assert (0); /* { dg-error "static assertion failed" } */
 static_assert (0, "message"); /* { dg-error "message" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-1.c b/gcc/testsuite/gcc.dg/c2x-stdarg-1.c
index 7def49d3..5155188 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-stdarg-1.c
@@ -1,7 +1,7 @@
-/* Test C2x variadic functions with no named parameters.  Compilation tests,
+/* Test C23 variadic functions with no named parameters.  Compilation tests,
    valid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int f (...);
 int g (int (...));
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-2.c b/gcc/testsuite/gcc.dg/c2x-stdarg-2.c
index 2778240..3499366 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-stdarg-2.c
@@ -1,7 +1,7 @@
-/* Test C2x variadic functions with no named parameters.  Compilation tests,
+/* Test C23 variadic functions with no named parameters.  Compilation tests,
    valid code, verify not considered unprototyped functions.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wstrict-prototypes -Wold-style-definition" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wstrict-prototypes -Wold-style-definition" } */
 
 int f (...);
 int g (int (...));
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-3.c b/gcc/testsuite/gcc.dg/c2x-stdarg-3.c
index e2e1406..10d97db 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-stdarg-3.c
@@ -1,7 +1,7 @@
-/* Test C2x variadic functions with no named parameters.  Compilation tests,
+/* Test C23 variadic functions with no named parameters.  Compilation tests,
    invalid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int f (...); /* { dg-message "previous declaration" } */
 int f (); /* { dg-error "conflicting types" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-4.c b/gcc/testsuite/gcc.dg/c2x-stdarg-4.c
index 1f8718d..cbbd9ef 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-stdarg-4.c
@@ -1,7 +1,7 @@
-/* Test C2x variadic functions with no named parameters, or last named
+/* Test C23 variadic functions with no named parameters, or last named
    parameter with a declaration not allowed in C17.  Execution tests.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdarg.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-5.c b/gcc/testsuite/gcc.dg/c2x-stdarg-5.c
index 1342443..26fa859 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-5.c
+++ b/gcc/testsuite/gcc.dg/c2x-stdarg-5.c
@@ -1,6 +1,6 @@
-/* Test __STDC_VERSION_STDARG_H__ in C2x.  */
+/* Test __STDC_VERSION_STDARG_H__ in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdarg.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c b/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c
index 3a9ceb0..022be6b 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c
@@ -1,6 +1,6 @@
-/* Test __STDC_VERSION_STDATOMIC_H__ in C2x.  */
+/* Test __STDC_VERSION_STDATOMIC_H__ in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdatomic.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-stddef-1.c b/gcc/testsuite/gcc.dg/c2x-stddef-1.c
index 1ebdf20..39cc5fb 100644
--- a/gcc/testsuite/gcc.dg/c2x-stddef-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-stddef-1.c
@@ -1,6 +1,6 @@
-/* Test __STDC_VERSION_STDDEF_H__ in C2x.  */
+/* Test __STDC_VERSION_STDDEF_H__ in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stddef.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-stdint-1.c b/gcc/testsuite/gcc.dg/c2x-stdint-1.c
index 3ba6ce5..9a984cf 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdint-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-stdint-1.c
@@ -1,6 +1,6 @@
-/* Test __STDC_VERSION_STDINT_H__ in C2x.  */
+/* Test __STDC_VERSION_STDINT_H__ in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors -ffreestanding" } */
+/* { dg-options "-std=c23 -pedantic-errors -ffreestanding" } */
 
 #include <stdint.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-thread-local-1.c b/gcc/testsuite/gcc.dg/c2x-thread-local-1.c
index e1917bd..8b48313 100644
--- a/gcc/testsuite/gcc.dg/c2x-thread-local-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-thread-local-1.c
@@ -1,6 +1,6 @@
-/* Test C2x thread_local keyword.  */
+/* Test C23 thread_local keyword.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 thread_local int a;
 thread_local void f (void); /* { dg-error "storage class" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-thread-local-2.c b/gcc/testsuite/gcc.dg/c2x-thread-local-2.c
index d199ff2..1d063f0 100644
--- a/gcc/testsuite/gcc.dg/c2x-thread-local-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-thread-local-2.c
@@ -1,7 +1,7 @@
 /* Test that thread-local declarations are not considered tentative definitions
-   in C2x.  */
+   in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 thread_local int a; /* { dg-message "previous" } */
 thread_local int a; /* { dg-error "redefinition" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-1.c b/gcc/testsuite/gcc.dg/c2x-typeof-1.c
index 0b721fe..cbc5f28 100644
--- a/gcc/testsuite/gcc.dg/c2x-typeof-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-typeof-1.c
@@ -1,6 +1,6 @@
-/* Test C2x typeof and typeof_unqual.  Valid code.  */
+/* Test C23 typeof and typeof_unqual.  Valid code.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int i;
 extern typeof (i) i;
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-2.c b/gcc/testsuite/gcc.dg/c2x-typeof-2.c
index f1c30a0..0c42a07 100644
--- a/gcc/testsuite/gcc.dg/c2x-typeof-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-typeof-2.c
@@ -1,6 +1,6 @@
-/* Test C2x typeof and typeof_unqual.  Invalid code.  */
+/* Test C23 typeof and typeof_unqual.  Invalid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 struct s { int i : 2; } x;
 union u { unsigned int j : 1; } y;
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-3.c b/gcc/testsuite/gcc.dg/c2x-typeof-3.c
index c7a0577..824b3ef 100644
--- a/gcc/testsuite/gcc.dg/c2x-typeof-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-typeof-3.c
@@ -1,7 +1,7 @@
-/* Test C2x typeof and typeof_unqual.  -fno-asm has no effect on keywords in
-   C2x mode.  */
+/* Test C23 typeof and typeof_unqual.  -fno-asm has no effect on keywords in
+   C23 mode.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -fno-asm" } */
+/* { dg-options "-std=c23 -pedantic-errors -fno-asm" } */
 
 int i;
 extern typeof (i) i;
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-1.c b/gcc/testsuite/gcc.dg/c2x-unproto-1.c
index d21c6a7..12957e2 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-unproto-1.c
@@ -1,9 +1,9 @@
 /* Test compatibility of prototyped function types with and without arguments
-   (C2x made the case of types affected by default argument promotions
+   (C23 made the case of types affected by default argument promotions
    compatible, before removing unprototyped functions completely).  Test
-   affected usages are not accepted for C2x.  */
+   affected usages are not accepted for C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 void f1 (); /* { dg-message "previous declaration" } */
 void f1 (float); /* { dg-error "conflicting types" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-2.c b/gcc/testsuite/gcc.dg/c2x-unproto-2.c
index 533fb74..c21a148 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-unproto-2.c
@@ -1,9 +1,9 @@
 /* Test compatibility of prototyped function types without arguments and with
-   variable arguments (C2x made the case of types affected by default argument
+   variable arguments (C23 made the case of types affected by default argument
    promotions compatible, before removing unprototyped functions completely).
-   Test always-invalid-in-C2x usages, in C2X mode.  */
+   Test always-invalid-in-C23 usages, in C23 mode.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 void f1 (); /* { dg-message "previous declaration" } */
 void f1 (int, ...); /* { dg-error "conflicting types" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-3.c b/gcc/testsuite/gcc.dg/c2x-unproto-3.c
index 762f8b2..6dc83dc 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-unproto-3.c
@@ -1,7 +1,7 @@
-/* Test that declaring a function with () is the same as (void) in C2X.  Valid
+/* Test that declaring a function with () is the same as (void) in C23.  Valid
    use cases.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -Wstrict-prototypes" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wstrict-prototypes" } */
 
 void f1 ();
 void f1 (void);
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-4.c b/gcc/testsuite/gcc.dg/c2x-unproto-4.c
index fceff22..7321753 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-4.c
+++ b/gcc/testsuite/gcc.dg/c2x-unproto-4.c
@@ -1,7 +1,7 @@
-/* Test that declaring a function with () is the same as (void) in C2X.
+/* Test that declaring a function with () is the same as (void) in C23.
    Invalid use cases.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 void f1 (); /* { dg-message "previous declaration" } */
 void f1 (int); /* { dg-error "conflicting types" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-unreachable-1.c b/gcc/testsuite/gcc.dg/c2x-unreachable-1.c
index 468f1f8..4cbe7f0 100644
--- a/gcc/testsuite/gcc.dg/c2x-unreachable-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-unreachable-1.c
@@ -1,6 +1,6 @@
-/* Test unreachable in <stddef.h> for C2x.  */
+/* Test unreachable in <stddef.h> for C23.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors -O2" } */
+/* { dg-options "-std=c23 -pedantic-errors -O2" } */
 
 #include <stddef.h>
 
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-1.c b/gcc/testsuite/gcc.dg/c2x-utf8char-1.c
index 76543af..e5e8094 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8char-1.c
+++ b/gcc/testsuite/gcc.dg/c2x-utf8char-1.c
@@ -1,6 +1,6 @@
-/* Test C2x UTF-8 characters.  Test valid usages.  */
+/* Test C23 UTF-8 characters.  Test valid usages.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 unsigned char a = u8'a';
 _Static_assert (u8'a' == 97);
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-2.c b/gcc/testsuite/gcc.dg/c2x-utf8char-2.c
index 4e6a2f6..94ad6f3 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8char-2.c
+++ b/gcc/testsuite/gcc.dg/c2x-utf8char-2.c
@@ -1,8 +1,8 @@
-/* Test C2x UTF-8 characters.  Character values not affected by
+/* Test C23 UTF-8 characters.  Character values not affected by
    different execution character set.  */
 /* { dg-do compile } */
 /* { dg-require-iconv "IBM1047" } */
-/* { dg-options "-std=c2x -pedantic-errors -fexec-charset=IBM1047" } */
+/* { dg-options "-std=c23 -pedantic-errors -fexec-charset=IBM1047" } */
 
 _Static_assert (u8'a' == 97);
 _Static_assert (u8'a' != (unsigned char) 'a');
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-3.c b/gcc/testsuite/gcc.dg/c2x-utf8char-3.c
index 7c48983..e152edb 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8char-3.c
+++ b/gcc/testsuite/gcc.dg/c2x-utf8char-3.c
@@ -1,6 +1,6 @@
-/* Test C2x UTF-8 characters.  Test errors for invalid code.  */
+/* Test C23 UTF-8 characters.  Test errors for invalid code.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 unsigned char a = u8''; /* { dg-error "empty character constant" } */
 unsigned char b = u8'ab'; /* { dg-error "character constant too long for its type" } */
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8str-type.c b/gcc/testsuite/gcc.dg/c2x-utf8str-type.c
index ebdde97..36c5d01 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8str-type.c
+++ b/gcc/testsuite/gcc.dg/c2x-utf8str-type.c
@@ -1,6 +1,6 @@
-/* Test C2X UTF-8 string literal type.  */
+/* Test C23 UTF-8 string literal type.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 _Static_assert (_Generic (u8"text", unsigned char*: 1, default: 2) == 1, "UTF-8 string literals have an unexpected type");
 _Static_assert (_Generic (u8"x"[0], unsigned char:  1, default: 2) == 1, "UTF-8 string literal elements have an unexpected type");
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8str.c b/gcc/testsuite/gcc.dg/c2x-utf8str.c
index 2e4c392..6efd97b 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8str.c
+++ b/gcc/testsuite/gcc.dg/c2x-utf8str.c
@@ -1,7 +1,7 @@
-/* Test initialization by UTF-8 string literal in C2X.  */
+/* Test initialization by UTF-8 string literal in C23.  */
 /* { dg-do compile } */
 /* { dg-require-effective-target wchar } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 typedef __CHAR8_TYPE__  char8_t;
 typedef __CHAR16_TYPE__ char16_t;
diff --git a/gcc/testsuite/gcc.dg/c90-auto-1.c b/gcc/testsuite/gcc.dg/c90-auto-1.c
index f00f767..f3c476c 100644
--- a/gcc/testsuite/gcc.dg/c90-auto-1.c
+++ b/gcc/testsuite/gcc.dg/c90-auto-1.c
@@ -5,7 +5,7 @@
 void
 f (void)
 {
-  /* This should have type int following C90 rules, whereas in C2x it
+  /* This should have type int following C90 rules, whereas in C23 it
      would have type double.  */
   auto x = 1.5;
   int *p = &x;
diff --git a/gcc/testsuite/gcc.dg/c90-complit-2.c b/gcc/testsuite/gcc.dg/c90-complit-2.c
index 6fcf2a5..bbd342e 100644
--- a/gcc/testsuite/gcc.dg/c90-complit-2.c
+++ b/gcc/testsuite/gcc.dg/c90-complit-2.c
@@ -1,4 +1,4 @@
-/* Test C2x storage class specifiers in compound literals not permitted for
+/* Test C23 storage class specifiers in compound literals not permitted for
    C90, but without a duplicate diagnostic, just the diagnostic for compound
    literals not being permitted in C90 at all.  */
 /* { dg-do compile } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c11-warning-3.c b/gcc/testsuite/gcc.dg/cpp/c11-warning-3.c
index a554a5b..124d168 100644
--- a/gcc/testsuite/gcc.dg/cpp/c11-warning-3.c
+++ b/gcc/testsuite/gcc.dg/cpp/c11-warning-3.c
@@ -1,6 +1,6 @@
 /* Test #warning not in C11.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c11 -Wc11-c2x-compat" } */
+/* { dg-options "-std=c11 -Wc11-c23-compat" } */
 
 #warning example text /* { dg-warning "example text" } */
 /* { dg-warning "#warning before C23 is a GCC extension" "compat" { target *-*-* } .-1 } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c
index b23e311..0b49067 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c
@@ -1,6 +1,6 @@
-/* Test #elifdef and #elifndef in C2x.  */
+/* Test #elifdef and #elifndef in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #define A
 #undef B
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c b/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c
index 9132832..35eb4aa 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c
@@ -1,6 +1,6 @@
-/* Test #elifdef and #elifndef in C2x: erroneous usages.  */
+/* Test #elifdef and #elifndef in C23: erroneous usages.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #define A
 #undef B
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c
index 8337ba7..7a145ac 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c
@@ -1,6 +1,6 @@
-/* Test :: token in C2x.  */
+/* Test :: token in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #define CONCAT(x, y) x ## y
 
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c b/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
index 73b36e7..a372b56 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
@@ -1,6 +1,6 @@
-/* Test :: token in C2x: preprocessed output.  */
+/* Test :: token in C23: preprocessed output.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors -P" } */
+/* { dg-options "-std=c23 -pedantic-errors -P" } */
 
 #define COLON() :
 #define TEST() ABC
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c
index bbc2152..e0401ab 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c
@@ -1,6 +1,6 @@
-/* Test trigraphs not supported in C2x.  */
+/* Test trigraphs not supported in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 const char a[] = "??=??(??/??/??)??'??<??!??>??-";
 const char b[] = "?""?=?""?(?""?/?""?/?""?)?""?'?""?<?""?!?""?>?""?-";
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c b/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c
index 38ee489..673dda3 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c
@@ -1,5 +1,5 @@
-/* Test trigraphs supported in C2x with -trigraphs used.  */
+/* Test trigraphs supported in C23 with -trigraphs used.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors -trigraphs" } */
+/* { dg-options "-std=c23 -pedantic-errors -trigraphs" } */
 
 #include "trigraphs.c"
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c
index a4998ae..f89cfc6 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c
@@ -1,6 +1,6 @@
-/* Test characters not permitted in UCNs in C2x.  */
+/* Test characters not permitted in UCNs in C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #if U'\u0000' /* { dg-error "is not a valid universal character" } */
 #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c
index 55d2281..a216e77 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c
@@ -1,6 +1,6 @@
-/* Test C2x (= Unicode) rules for characters in identifiers.  */
+/* Test C23 (= Unicode) rules for characters in identifiers.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 ¨
 
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c
index f9fdbea..cb811bc 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c
@@ -1,6 +1,6 @@
-/* Test C2x (= Unicode) rules for characters in identifiers.  */
+/* Test C23 (= Unicode) rules for characters in identifiers.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 \u00A8 /* { dg-error "is not valid in an identifier" } */
 
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c
index bd438f7..8ce811b 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c
@@ -1,7 +1,7 @@
 /* Test __VA_OPT__ and no "..." arguments in a call to a variable-arguments
-   macro accepted for C2X.  */
+   macro accepted for C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #define CALL(F, ...) F (7 __VA_OPT__(,) __VA_ARGS__)
 #define M(X, ...) X
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c b/gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c
index 696a0cd..cac3a6f 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c
@@ -1,5 +1,5 @@
-/* Test #warning in C2x.  */
+/* Test #warning in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #warning example text /* { dg-warning "example text" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c b/gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c
index 028788a..bfa52b4 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c
@@ -1,6 +1,6 @@
-/* Test #warning in C23: -Wc11-c2x-comapt.  */
+/* Test #warning in C23: -Wc11-c23-compat.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=c2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -pedantic-errors -Wc11-c23-compat" } */
 
 #warning example text /* { dg-warning "example text" } */
 /* { dg-warning "#warning before C23 is a GCC extension" "compat" { target *-*-* } .-1 } */
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu11-warning-3.c b/gcc/testsuite/gcc.dg/cpp/gnu11-warning-3.c
index 25422b9..6c7084c 100644
--- a/gcc/testsuite/gcc.dg/cpp/gnu11-warning-3.c
+++ b/gcc/testsuite/gcc.dg/cpp/gnu11-warning-3.c
@@ -1,6 +1,6 @@
 /* Test #warning not in C11.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=gnu11 -Wc11-c2x-compat" } */
+/* { dg-options "-std=gnu11 -Wc11-c23-compat" } */
 
 #warning example text /* { dg-warning "example text" } */
 /* { dg-warning "#warning before C23 is a GCC extension" "compat" { target *-*-* } .-1 } */
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c b/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c
index c8e5290..7376b8f 100644
--- a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c
@@ -1,5 +1,5 @@
-/* Test #warning in C2x.  */
+/* Test #warning in C23.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=gnu2x -pedantic-errors" } */
+/* { dg-options "-std=gnu23 -pedantic-errors" } */
 
 #warning example text /* { dg-warning "example text" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c b/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c
index 5fce094..c5c4b3d 100644
--- a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c
@@ -1,6 +1,6 @@
-/* Test #warning in C23: -Wc11-c2x-comapt.  */
+/* Test #warning in C23: -Wc11-c23-compat.  */
 /* { dg-do preprocess } */
-/* { dg-options "-std=gnu2x -pedantic-errors -Wc11-c2x-compat" } */
+/* { dg-options "-std=gnu23 -pedantic-errors -Wc11-c23-compat" } */
 
 #warning example text /* { dg-warning "example text" } */
 /* { dg-warning "#warning before C23 is a GCC extension" "compat" { target *-*-* } .-1 } */
diff --git a/gcc/testsuite/gcc.dg/cr-decimal-dig-2.c b/gcc/testsuite/gcc.dg/cr-decimal-dig-2.c
index 42e79d5..1eccf14 100644
--- a/gcc/testsuite/gcc.dg/cr-decimal-dig-2.c
+++ b/gcc/testsuite/gcc.dg/cr-decimal-dig-2.c
@@ -1,7 +1,7 @@
-/* Test TS 18661-1 CR_DECIMAL_DIG: not in C2X without
+/* Test TS 18661-1 CR_DECIMAL_DIG: not in C23 without
    __STDC_WANT_IEC_60559_BFP_EXT__ defined.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/cr-decimal-dig-3.c b/gcc/testsuite/gcc.dg/cr-decimal-dig-3.c
index 8e07b67..2e1d5af 100644
--- a/gcc/testsuite/gcc.dg/cr-decimal-dig-3.c
+++ b/gcc/testsuite/gcc.dg/cr-decimal-dig-3.c
@@ -1,6 +1,6 @@
-/* Test C2x CR_DECIMAL_DIG: defined for __STDC_WANT_IEC_60559_EXT__.  */
+/* Test C23 CR_DECIMAL_DIG: defined for __STDC_WANT_IEC_60559_EXT__.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #define __STDC_WANT_IEC_60559_EXT__
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-1.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-1.c
index f8da702..f2f6d47 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-1.c
@@ -1,7 +1,7 @@
 /* Test non-canonical BID significands: _Decimal128.  Bug 91226.  */
 /* { dg-do run { target lp64 } } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O2" } */
+/* { dg-options "-std=gnu23 -O2" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-2.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-2.c
index dade48f..ba4b9cd 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-2.c
@@ -2,7 +2,7 @@
    combination field starts 11.  Bug 91226.  */
 /* { dg-do run { target lp64 } } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O2" } */
+/* { dg-options "-std=gnu23 -O2" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-3.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-3.c
index 77c0941..a16ecf8 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-3.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-3.c
@@ -1,6 +1,6 @@
 /* Test non-canonical BID significands: _Decimal128.  Bug 91226.  */
 /* { dg-do run { target lp64 } } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O0" } */
+/* { dg-options "-std=gnu23 -O0" } */
 
 #include "bid-non-canonical-d128-1.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-4.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-4.c
index 93ff0fc..1504e07 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-4.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d128-4.c
@@ -2,6 +2,6 @@
    combination field starts 11.  Bug 91226.  */
 /* { dg-do run { target lp64 } } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O0" } */
+/* { dg-options "-std=gnu23 -O0" } */
 
 #include "bid-non-canonical-d128-2.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-1.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-1.c
index 69d014f..593f06b 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-1.c
@@ -1,7 +1,7 @@
 /* Test non-canonical BID significands: _Decimal32.  Bug 91226.  */
 /* { dg-do run } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O2" } */
+/* { dg-options "-std=gnu23 -O2" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-2.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-2.c
index 874b2fb..ae2c926 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d32-2.c
@@ -1,6 +1,6 @@
 /* Test non-canonical BID significands: _Decimal32.  Bug 91226.  */
 /* { dg-do run } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O0" } */
+/* { dg-options "-std=gnu23 -O0" } */
 
 #include "bid-non-canonical-d32-1.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-1.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-1.c
index 4602d34..bb0cb1a 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-1.c
@@ -1,7 +1,7 @@
 /* Test non-canonical BID significands: _Decimal64.  Bug 91226.  */
 /* { dg-do run } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O2" } */
+/* { dg-options "-std=gnu23 -O2" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-2.c b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-2.c
index c2993b6..1375ab5 100644
--- a/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/bid-non-canonical-d64-2.c
@@ -1,6 +1,6 @@
 /* Test non-canonical BID significands: _Decimal64.  Bug 91226.  */
 /* { dg-do run } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O0" } */
+/* { dg-options "-std=gnu23 -O0" } */
 
 #include "bid-non-canonical-d64-1.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-1.c b/gcc/testsuite/gcc.dg/dfp/bitint-1.c
index 64f50d0..ab826e1 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-1.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
 __attribute__((noipa)) _BitInt(192)
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-2.c b/gcc/testsuite/gcc.dg/dfp/bitint-2.c
index 7fb629a..68cce0e 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-2.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
 __attribute__((noipa)) _BitInt(192)
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-3.c b/gcc/testsuite/gcc.dg/dfp/bitint-3.c
index 28a7e84..911bf8a 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-3.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-3.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
 __attribute__((noipa)) _BitInt(192)
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-4.c b/gcc/testsuite/gcc.dg/dfp/bitint-4.c
index 513ead1..0b60110 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-4.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-4.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
 __attribute__((noipa)) _Decimal64
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-5.c b/gcc/testsuite/gcc.dg/dfp/bitint-5.c
index 4b04141..37d373c 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-5.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-5.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
 __attribute__((noipa)) _Decimal32
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-6.c b/gcc/testsuite/gcc.dg/dfp/bitint-6.c
index 54aa157..eb137a6 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-6.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-6.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-O2 -std=c2x -pedantic-errors" } */
+/* { dg-options "-O2 -std=c23 -pedantic-errors" } */
 
 #if __BITINT_MAXWIDTH__ >= 192
 __attribute__((noipa)) _Decimal128
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-7.c b/gcc/testsuite/gcc.dg/dfp/bitint-7.c
index 6794e38..49e8103 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-7.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-7.c
@@ -2,7 +2,7 @@
 /* Test non-canonical BID significands.  */
 /* { dg-do run { target bitint } } */
 /* { dg-require-effective-target dfp_bid } */
-/* { dg-options "-std=gnu2x -O2" } */
+/* { dg-options "-std=gnu23 -O2" } */
 
 union U32
 {
diff --git a/gcc/testsuite/gcc.dg/dfp/bitint-8.c b/gcc/testsuite/gcc.dg/dfp/bitint-8.c
index 7656cb1..18263e2 100644
--- a/gcc/testsuite/gcc.dg/dfp/bitint-8.c
+++ b/gcc/testsuite/gcc.dg/dfp/bitint-8.c
@@ -1,7 +1,7 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
 /* { dg-require-effective-target fenv_exceptions } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <fenv.h>
 
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c
index 88b8b33..c078e8e 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c
@@ -1,7 +1,7 @@
-/* Test C2x built-in functions: test functions new in C2x are indeed
+/* Test C23 built-in functions: test functions new in C23 are indeed
    declared as built-in as expected.  DFP tests.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 int fabsd32 (void); /* { dg-warning "conflicting types for built-in function" } */
 int fabsd64 (void); /* { dg-warning "conflicting types for built-in function" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
index 3375506..acd9640 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
@@ -1,6 +1,6 @@
-/* Test that DFP constants are accepted in C2X mode.  */
+/* Test that DFP constants are accepted in C23 mode.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int a = (int) 1.1DF;
 int b = (int) 2.df;
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c b/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c
index befdd16..d98aba4 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c
@@ -1,6 +1,6 @@
 /* Test that DFP constants are accepted in C23 mode: compat warnings.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 
 int a = (int) 1.1DF; /* { dg-warning "C23 feature" } */
 int b = (int) 2.df; /* { dg-warning "C23 feature" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c
index 4ac6629..d7e7c90 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code, compilation tests, DFP.  */
+/* Test C23 constexpr.  Valid code, compilation tests, DFP.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 constexpr _Decimal32 v1 = __DEC32_MIN__;
 constexpr _Decimal32 v2 = __DEC32_SUBNORMAL_MIN__;
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c b/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c
index 8ce0d08..9c0fc9d 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Invalid code, compilation tests, DFP.  */
+/* Test C23 constexpr.  Invalid code, compilation tests, DFP.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 /* Test conversions between binary and decimal.  */
 constexpr double v2 = 0.0DF; /* { dg-error "'constexpr' initializer for a binary floating-point type is of decimal type" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
index ee5e678..1ab650b 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
@@ -1,6 +1,6 @@
 /* Test DFP macros defined in <float.h> with DFP support.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
index 9ba5690..1b3e693 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
@@ -1,7 +1,7 @@
 /* Test DFP macros defined in <float.h> with DFP support.  TS 18661-2
    feature test macro does not change what is defined.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
index 00b51a4..8fb4058 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
@@ -1,7 +1,7 @@
 /* Test DFP macros defined in <float.h> with DFP support.  TR 24732
    feature test macro causes *_SUBNORMAL_MIN macros to be defined.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #define __STDC_WANT_DEC_FP__
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c
index 58ee74d..d7d04bd 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c
@@ -1,6 +1,6 @@
 /* Test DEC_INFINITY defined in <float.h> with DFP support.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c
index 8d09725..19a5fbb 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c
@@ -1,6 +1,6 @@
 /* Test DEC_NAN defined in <float.h> with DFP support.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c
index 4533c61..d00c390 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c
@@ -4,7 +4,7 @@
    support in libgcc does not integrate with hardware exceptions.)  */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <fenv.h>
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c
index dec6b50..bc1cd4b 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c
@@ -1,6 +1,6 @@
 /* Test DEC*_SNAN macros defined in <float.h> with DFP support.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <float.h>
 
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c
index 4169602..06bbfa5 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c
@@ -2,7 +2,7 @@
    support.  */
 /* { dg-do run } */
 /* { dg-require-effective-target fenv_exceptions_dfp } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <fenv.h>
 #include <float.h>
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
index a3a1da5..9e7f4d9 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
@@ -1,6 +1,6 @@
-/* Test that _Decimal* keywords are accepted in C2X mode.  */
+/* Test that _Decimal* keywords are accepted in C23 mode.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 _Decimal32 d32;
 _Decimal64 d64;
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
index 9655dd0..26cefd7 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
@@ -1,6 +1,6 @@
-/* Test that _Decimal* keywords are accepted in C2X mode: compat warnings.  */
+/* Test that _Decimal* keywords are accepted in C23 mode: compat warnings.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=c23 -Wc11-c23-compat" } */
 
 _Decimal32 d32; /* { dg-warning "ISO C does not support" } */
 _Decimal64 d64; /* { dg-warning "ISO C does not support" } */
diff --git a/gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c
index c196816..8f2f99f 100644
--- a/gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/tr24732-float-dfp-1.c
@@ -91,7 +91,7 @@
 # error "DEC128_SUBNORMAL_MIN not defined"
 #endif
 
-/* These macros from C2X should not be defined.  */
+/* These macros from C23 should not be defined.  */
 
 #ifdef DEC32_TRUE_MIN
 # error "DEC32_TRUE_MIN defined"
diff --git a/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
index f0a0824..e43ecac 100644
--- a/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/ts18661-2-float-dfp-1.c
@@ -1,5 +1,5 @@
 /* Test DFP macros defined in <float.h> with DFP support.  TS 18661-2
-   feature test macro causes same macros to be defined as for C2X.  */
+   feature test macro causes same macros to be defined as for C23.  */
 /* { dg-do compile } */
 /* { dg-options "-std=gnu99" } */
 
diff --git a/gcc/testsuite/gcc.dg/fixed-point/bitint-1.c b/gcc/testsuite/gcc.dg/fixed-point/bitint-1.c
index de525ad..49e5b5c 100644
--- a/gcc/testsuite/gcc.dg/fixed-point/bitint-1.c
+++ b/gcc/testsuite/gcc.dg/fixed-point/bitint-1.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do compile { target bitint } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 void
 foo (void)
diff --git a/gcc/testsuite/gcc.dg/format/c11-printf-1.c b/gcc/testsuite/gcc.dg/format/c11-printf-1.c
index 05d242e..2cf117d 100644
--- a/gcc/testsuite/gcc.dg/format/c11-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c11-printf-1.c
@@ -1,4 +1,4 @@
-/* Test for printf formats: rejection of C2X (and C2X-recommended) formats in
+/* Test for printf formats: rejection of C23 (and C23-recommended) formats in
    pedantic mode.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic -Wformat" } */
diff --git a/gcc/testsuite/gcc.dg/format/c11-scanf-1.c b/gcc/testsuite/gcc.dg/format/c11-scanf-1.c
index 4edd2a3..c337325 100644
--- a/gcc/testsuite/gcc.dg/format/c11-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c11-scanf-1.c
@@ -1,4 +1,4 @@
-/* Test for printf formats: rejection of C2X formats in pedantic mode.  */
+/* Test for printf formats: rejection of C23 formats in pedantic mode.  */
 /* { dg-do compile } */
 /* { dg-options "-std=c11 -pedantic -Wformat" } */
 
diff --git a/gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c b/gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c
index dc40f99..56707c4 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c
@@ -1,7 +1,7 @@
 /* Test for printf formats: acceptance of DFP formats in pedantic mode.  */
 /* { dg-do compile } */
 /* { dg-require-effective-target dfp } */
-/* { dg-options "-std=c2x -pedantic -Wformat" } */
+/* { dg-options "-std=c23 -pedantic -Wformat" } */
 
 #include "format.h"
 
diff --git a/gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c b/gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c
index 81e39a9..d295904 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c
@@ -1,7 +1,7 @@
 /* Test for scanf formats: acceptance of DFP formats in pedantic mode.  */
 /* { dg-do compile } */
 /* { dg-require-effective-target dfp } */
-/* { dg-options "-std=c2x -pedantic -Wformat" } */
+/* { dg-options "-std=c23 -pedantic -Wformat" } */
 
 #include "format.h"
 
diff --git a/gcc/testsuite/gcc.dg/format/c2x-printf-1.c b/gcc/testsuite/gcc.dg/format/c2x-printf-1.c
index 9be7d47..4e50bfe 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c2x-printf-1.c
@@ -1,6 +1,6 @@
-/* Test for printf formats.  Formats using C2X features.  */
+/* Test for printf formats.  Formats using C23 features.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic -Wformat" } */
+/* { dg-options "-std=c23 -pedantic -Wformat" } */
 
 #include "format.h"
 
diff --git a/gcc/testsuite/gcc.dg/format/c2x-scanf-1.c b/gcc/testsuite/gcc.dg/format/c2x-scanf-1.c
index 88fab12..e1c69af 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c2x-scanf-1.c
@@ -1,6 +1,6 @@
-/* Test for scanf formats.  Formats using C2X features.  */
+/* Test for scanf formats.  Formats using C23 features.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic -Wformat" } */
+/* { dg-options "-std=c23 -pedantic -Wformat" } */
 
 #include "format.h"
 
diff --git a/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c b/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c
index c6e7619..80f2788 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c
+++ b/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c
@@ -1,6 +1,6 @@
-/* Test for strftime formats.  Formats using C2x features.  */
+/* Test for strftime formats.  Formats using C23 features.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic -Wformat" } */
+/* { dg-options "-std=c23 -pedantic -Wformat" } */
 
 #include "format.h"
 
diff --git a/gcc/testsuite/gcc.dg/format/ext-10.c b/gcc/testsuite/gcc.dg/format/ext-10.c
index 370ea86..4b3ad21 100644
--- a/gcc/testsuite/gcc.dg/format/ext-10.c
+++ b/gcc/testsuite/gcc.dg/format/ext-10.c
@@ -1,6 +1,6 @@
-/* Test for scanf format extensions using formats from C2X.  */
+/* Test for scanf format extensions using formats from C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x -Wformat" } */
+/* { dg-options "-std=gnu23 -Wformat" } */
 
 #include "format.h"
 
diff --git a/gcc/testsuite/gcc.dg/format/ext-9.c b/gcc/testsuite/gcc.dg/format/ext-9.c
index 8f09129..bb41f0d 100644
--- a/gcc/testsuite/gcc.dg/format/ext-9.c
+++ b/gcc/testsuite/gcc.dg/format/ext-9.c
@@ -1,7 +1,7 @@
 /* Test for printf format extensions using formats from or recommended by
-   C2X.  */
+   C23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x -Wformat" } */
+/* { dg-options "-std=gnu23 -Wformat" } */
 
 #include "format.h"
 
diff --git a/gcc/testsuite/gcc.dg/gnu11-typeof-2.c b/gcc/testsuite/gcc.dg/gnu11-typeof-2.c
index e60ad46..93b23fb 100644
--- a/gcc/testsuite/gcc.dg/gnu11-typeof-2.c
+++ b/gcc/testsuite/gcc.dg/gnu11-typeof-2.c
@@ -1,6 +1,6 @@
 /* Test typeof propagation of noreturn function attributes with -std=gnu11:
    these are part of the type of a function pointer with GNU typeof, but not
-   with C2x typeof.  */
+   with C23 typeof.  */
 /* { dg-do link } */
 /* { dg-options "-std=gnu11 -O2" } */
 
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c b/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c
index bd21086..2576089 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c
@@ -1,7 +1,7 @@
-/* Test C2x attribute syntax.  Basic tests of valid uses of empty
+/* Test C23 attribute syntax.  Basic tests of valid uses of empty
    attributes with GNU C features.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 /* Attributes can be used in declarations after __extension__, and
    before asm statements.  */
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c b/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c
index 97d1654..ba60f7a 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c
@@ -1,11 +1,11 @@
-/* Test C2x attribute syntax.  Invalid uses of attributes with GNU C
+/* Test C23 attribute syntax.  Invalid uses of attributes with GNU C
    features.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x -w" } */
+/* { dg-options "-std=gnu23 -w" } */
 
 /* Attributes cannot be used as prefix attributes on old-style
    parameter declarations or on function declarators with identifier
-   lists (removed from C2x).  */
+   lists (removed from C23).  */
 
 void (*f(a, b) [[]])() int a, b; { } /* { dg-error "expected" } */
 
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attrs-1.c b/gcc/testsuite/gcc.dg/gnu2x-attrs-1.c
index 2007911..67ab483 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attrs-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-attrs-1.c
@@ -1,8 +1,8 @@
-/* Test C2x attribute syntax.  Test GNU attributes appertain to
+/* Test C23 attribute syntax.  Test GNU attributes appertain to
    appropriate constructs.  */
 /* { dg-do compile } */
 /* { dg-require-alias "" } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 void f (void) {};
 
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attrs-2.c b/gcc/testsuite/gcc.dg/gnu2x-attrs-2.c
index d512b2a..bcdfcf8 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attrs-2.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-attrs-2.c
@@ -1,8 +1,8 @@
-/* Test C2x attribute syntax.  Test GNU attributes appertain to
+/* Test C23 attribute syntax.  Test GNU attributes appertain to
    appropriate constructs.  Attributes on types not being defined at
    the time.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x -Wformat" } */
+/* { dg-options "-std=gnu23 -Wformat" } */
 
 typedef void va_type (const char *, ...);
 typedef va_type [[gnu::format (printf, 1, 2)]] printf_like_1;
diff --git a/gcc/testsuite/gcc.dg/gnu2x-auto-1.c b/gcc/testsuite/gcc.dg/gnu2x-auto-1.c
index e0b9e86..82d3d3d 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-auto-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-auto-1.c
@@ -1,6 +1,6 @@
-/* Test C2x auto.  Invalid code with GNU extensions.  */
+/* Test C23 auto.  Invalid code with GNU extensions.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 void
 f ()
diff --git a/gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c b/gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c
index 853a56e..9fa25f0 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c
@@ -1,7 +1,7 @@
-/* Test C2x built-in functions: test DFP built-in functions are not
+/* Test C23 built-in functions: test DFP built-in functions are not
    available when no DFP support.  Bug 91985.  */
 /* { dg-do compile { target { ! dfp } } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 int fabsd32 (void);
 int fabsd64 (void);
diff --git a/gcc/testsuite/gcc.dg/gnu2x-complit-1.c b/gcc/testsuite/gcc.dg/gnu2x-complit-1.c
index e9da5ad..6bee02c 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-complit-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-complit-1.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals: GNU use of alignof
+/* Test C23 storage class specifiers in compound literals: GNU use of alignof
    on objects (tested separately since alignof parsing handles the type name of
    compound literals).  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 int a = alignof (static int) { 0 };
diff --git a/gcc/testsuite/gcc.dg/gnu2x-complit-2.c b/gcc/testsuite/gcc.dg/gnu2x-complit-2.c
index 20cb38f..4f36d81 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-complit-2.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-complit-2.c
@@ -1,7 +1,7 @@
-/* Test C2x storage class specifiers in compound literals.  Thread-local
+/* Test C23 storage class specifiers in compound literals.  Thread-local
    cases, compilation tests, GNU __thread used.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-require-effective-target tls } */
 
 #include <stddef.h>
diff --git a/gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c b/gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c
index 6078f08..834f90e 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code using GNU extensions, compilation tests.  */
+/* Test C23 constexpr.  Valid code using GNU extensions, compilation tests.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 struct s { struct { int x, y; } x; };
 constexpr struct s v = { { 123, 150 } };
diff --git a/gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c b/gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c
index e7dc9df..2933041 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c
@@ -1,7 +1,7 @@
-/* Test C2X support for empty initializers: valid use cases with GNU
+/* Test C23 support for empty initializers: valid use cases with GNU
    extensions.  */
 /* { dg-do run } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 extern void exit (int);
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c b/gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c
index 69ee4e3..f73d018 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c
@@ -1,7 +1,7 @@
-/* Test C2X support for empty initializers: invalid use cases with GNU
+/* Test C23 support for empty initializers: invalid use cases with GNU
    extensions.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 void
 f (int a)
diff --git a/gcc/testsuite/gcc.dg/gnu2x-enum-1.c b/gcc/testsuite/gcc.dg/gnu2x-enum-1.c
index b72ed73..797e416 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-enum-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-enum-1.c
@@ -1,8 +1,8 @@
-/* Test C2x enumerations with fixed underlying type together with GNU
+/* Test C23 enumerations with fixed underlying type together with GNU
    extensions: an enum cannot be forward declared without a fixed underlying
    type and then declared or defined with one.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 enum e1;
 enum e1 : int; /* { dg-error "'enum' declared both with and without fixed underlying type" } */
diff --git a/gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c b/gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c
index 4ed095c..2f84f47 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c
@@ -1,6 +1,6 @@
 /* Test C11 static assertions.  Omitting the string diagnosed with
-   -Wc11-c2x-compat.  */
+   -Wc11-c23-compat.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x -Wc11-c2x-compat" } */
+/* { dg-options "-std=gnu23 -Wc11-c23-compat" } */
 
 _Static_assert (1); /* { dg-warning "does not support omitting the string" } */
diff --git a/gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c b/gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c
index bb64cde..0a78b22 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c
@@ -1,7 +1,7 @@
 /* Test variadic functions with no named parameters do not accept GNU
    attributes before '...'.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 int f (__attribute__(()) ...); /* { dg-error "expected" } */
 int g (int (__attribute__(()) ...)); /* { dg-error "expected" } */
diff --git a/gcc/testsuite/gcc.dg/gnu2x-typeof-1.c b/gcc/testsuite/gcc.dg/gnu2x-typeof-1.c
index f14b54f..399b8e1 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-typeof-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-typeof-1.c
@@ -1,8 +1,8 @@
-/* Test __typeof__ propagation of noreturn function attributes with -std=gnu2x:
+/* Test __typeof__ propagation of noreturn function attributes with -std=gnu23:
    these are part of the type of a function pointer with GNU __typeof__, but
-   not with C2x typeof.  */
+   not with C23 typeof.  */
 /* { dg-do link } */
-/* { dg-options "-std=gnu2x -O2" } */
+/* { dg-options "-std=gnu23 -O2" } */
 
 _Noreturn void f (void);
 
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c b/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c
index 9c3add2..206ff23 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c
@@ -1,5 +1,5 @@
-/* Test C2x UTF-8 characters.  Test accepted with -std=gnu2x.  */
+/* Test C23 UTF-8 characters.  Test accepted with -std=gnu23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 #include "c2x-utf8char-1.c"
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c b/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c
index efe16ff..7b5ccb0 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c
@@ -1,5 +1,5 @@
-/* Test C2X UTF-8 string literal type with -std=gnu2x.  */
+/* Test C23 UTF-8 string literal type with -std=gnu23.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 #include "c2x-utf8str-type.c"
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8str.c b/gcc/testsuite/gcc.dg/gnu2x-utf8str.c
index f3719ea..4e52822 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8str.c
+++ b/gcc/testsuite/gcc.dg/gnu2x-utf8str.c
@@ -1,7 +1,7 @@
-/* Test initialization by UTF-8 string literal in C2X with -std=gnu2x.  */
+/* Test initialization by UTF-8 string literal in C23 with -std=gnu23.  */
 /* { dg-do compile } */
 /* { dg-require-effective-target wchar } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 typedef __CHAR8_TYPE__  char8_t;
 typedef __CHAR16_TYPE__ char16_t;
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-1.c b/gcc/testsuite/gcc.dg/gomp/attrs-1.c
index c7a5ae3..329b41a 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-1.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-1.c
@@ -1,4 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #include "../../g++.dg/gomp/attrs-1.C"
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-10.c b/gcc/testsuite/gcc.dg/gomp/attrs-10.c
index a7723b5..54afacf 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-10.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-10.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x -ffat-lto-objects -fdump-tree-gimple" } */
+/* { dg-options "-fopenmp -std=c23 -ffat-lto-objects -fdump-tree-gimple" } */
 
 extern void abort ();
 
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-11.c b/gcc/testsuite/gcc.dg/gomp/attrs-11.c
index 335ff3e..9b71f9b 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-11.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-11.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x -Wno-attributes" } */
+/* { dg-options "-fopenmp -std=c23 -Wno-attributes" } */
 
 void
 foo ()
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-12.c b/gcc/testsuite/gcc.dg/gomp/attrs-12.c
index 57c8fcf..ed4c041 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-12.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-12.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #pragma omp declare target
 #pragma omp declare target
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-13.c b/gcc/testsuite/gcc.dg/gomp/attrs-13.c
index ad8d9ae..9c0875e 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-13.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-13.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 [[omp::directive(error)]];			/* { dg-error "'pragma omp error' encountered" } */
 [[omp::directive(error, at(compilation))]];	/* { dg-error "'pragma omp error' encountered" } */
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-14.c b/gcc/testsuite/gcc.dg/gomp/attrs-14.c
index 1e462f2..26757b3 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-14.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-14.c
@@ -1,5 +1,5 @@
 /* PR c++/102413 */
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 [[omp::directive(error]];	/* { dg-error "expected|declare" } */
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-15.c b/gcc/testsuite/gcc.dg/gomp/attrs-15.c
index 2af4b21..cf5d216 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-15.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-15.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #pragma omp begin assumes absent (target)
 #pragma omp begin assumes absent (target)
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-16.c b/gcc/testsuite/gcc.dg/gomp/attrs-16.c
index 1d8e5bc..a211e49 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-16.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-16.c
@@ -1,4 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #include "../../g++.dg/gomp/attrs-16.C"
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-17.c b/gcc/testsuite/gcc.dg/gomp/attrs-17.c
index 5c9beb4..57ba449 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-17.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-17.c
@@ -1,4 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #include "../../g++.dg/gomp/attrs-17.C"
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-18.c b/gcc/testsuite/gcc.dg/gomp/attrs-18.c
index ff88f1d..08b1089 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-18.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-18.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #pragma omp begin declare target
 #pragma omp begin declare target device_type (any)
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-19.c b/gcc/testsuite/gcc.dg/gomp/attrs-19.c
index 6ada2e3..ad8156c 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-19.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-19.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 void foo1 ();
 
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-2.c b/gcc/testsuite/gcc.dg/gomp/attrs-2.c
index 0677ba3..56eb70a 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-2.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-2.c
@@ -1,4 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #include "../../g++.dg/gomp/attrs-2.C"
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-20.c b/gcc/testsuite/gcc.dg/gomp/attrs-20.c
index 91b9e04..06302af 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-20.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-20.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x -ffat-lto-objects -fdump-tree-gimple" } */
+/* { dg-options "-fopenmp -std=c23 -ffat-lto-objects -fdump-tree-gimple" } */
 
 extern void abort ();
 
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-21.c b/gcc/testsuite/gcc.dg/gomp/attrs-21.c
index ca97b76..551fe6c 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-21.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-21.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" */
+/* { dg-options "-fopenmp -std=c23" */
 
 void
 foo ()
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-3.c b/gcc/testsuite/gcc.dg/gomp/attrs-3.c
index 5777d8d..a0d65a2 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-3.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 int i;
 int t1, t2, t3, t4, t5, t6, t7;
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-4.c b/gcc/testsuite/gcc.dg/gomp/attrs-4.c
index 73610db..710b70a 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-4.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 void
 foo (int x)
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-5.c b/gcc/testsuite/gcc.dg/gomp/attrs-5.c
index ef70363..bbf91f6 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-5.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-5.c
@@ -1,4 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #include "../../g++.dg/gomp/attrs-5.C"
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-6.c b/gcc/testsuite/gcc.dg/gomp/attrs-6.c
index 1f77585..17300f8 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-6.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 void
 foo ()
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-7.c b/gcc/testsuite/gcc.dg/gomp/attrs-7.c
index 36adbb6..4417cbb 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-7.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-7.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 void
 foo ()
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-8.c b/gcc/testsuite/gcc.dg/gomp/attrs-8.c
index aba7b53..3d2f843 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-8.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-8.c
@@ -1,4 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #include "../../g++.dg/gomp/attrs-8.C"
diff --git a/gcc/testsuite/gcc.dg/gomp/attrs-9.c b/gcc/testsuite/gcc.dg/gomp/attrs-9.c
index 013a1c4..1d2207e 100644
--- a/gcc/testsuite/gcc.dg/gomp/attrs-9.c
+++ b/gcc/testsuite/gcc.dg/gomp/attrs-9.c
@@ -1,4 +1,4 @@
 /* { dg-do compile } */
-/* { dg-options "-fopenmp -std=c2x" } */
+/* { dg-options "-fopenmp -std=c23" } */
 
 #include "../../g++.dg/gomp/attrs-9.C"
diff --git a/gcc/testsuite/gcc.dg/limits-width-2.c b/gcc/testsuite/gcc.dg/limits-width-2.c
index a3c3895..cda6f84 100644
--- a/gcc/testsuite/gcc.dg/limits-width-2.c
+++ b/gcc/testsuite/gcc.dg/limits-width-2.c
@@ -1,6 +1,6 @@
-/* Test C2X width macros in <limits.h>.  */
+/* Test C23 width macros in <limits.h>.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <limits.h>
 
diff --git a/gcc/testsuite/gcc.dg/qual-return-10.c b/gcc/testsuite/gcc.dg/qual-return-10.c
index c7dd6ad..96ad44a 100644
--- a/gcc/testsuite/gcc.dg/qual-return-10.c
+++ b/gcc/testsuite/gcc.dg/qual-return-10.c
@@ -1,8 +1,8 @@
-/* Test qualifiers on function return types in C2X (C2X version of
+/* Test qualifiers on function return types in C23 (C23 version of
    qual-return-6.c): those qualifiers are now ignored for all purposes,
    including _Atomic, but should still get warnings.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -Wignored-qualifiers" } */
+/* { dg-options "-std=c23 -Wignored-qualifiers" } */
 
 const int f1 (void); /* { dg-warning "qualifiers ignored" } */
 volatile int f2 (void) { return 0; } /* { dg-warning "qualifiers ignored" } */
diff --git a/gcc/testsuite/gcc.dg/qual-return-9.c b/gcc/testsuite/gcc.dg/qual-return-9.c
index 7762782..c247e2a 100644
--- a/gcc/testsuite/gcc.dg/qual-return-9.c
+++ b/gcc/testsuite/gcc.dg/qual-return-9.c
@@ -1,8 +1,8 @@
-/* Test qualifiers on function return types in C2X (C2X version of
+/* Test qualifiers on function return types in C23 (C23 version of
    qual-return-5.c): those qualifiers are now ignored for all purposes,
    including _Atomic.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 int f1 (void);
 const int f1 (void);
diff --git a/gcc/testsuite/gcc.dg/sso-19.c b/gcc/testsuite/gcc.dg/sso-19.c
index 50f7b40..6cf848d 100644
--- a/gcc/testsuite/gcc.dg/sso-19.c
+++ b/gcc/testsuite/gcc.dg/sso-19.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* PR c/104822 */
 
 #include <stddef.h>
diff --git a/gcc/testsuite/gcc.dg/stdckdint-1.c b/gcc/testsuite/gcc.dg/stdckdint-1.c
index 1525a35..e104e68 100644
--- a/gcc/testsuite/gcc.dg/stdckdint-1.c
+++ b/gcc/testsuite/gcc.dg/stdckdint-1.c
@@ -1,6 +1,6 @@
 /* Test C23 Checked Integer Arithmetic macros in <stdckdint.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <stdckdint.h>
 
diff --git a/gcc/testsuite/gcc.dg/stdckdint-2.c b/gcc/testsuite/gcc.dg/stdckdint-2.c
index f83e3d7..efb87b5 100644
--- a/gcc/testsuite/gcc.dg/stdckdint-2.c
+++ b/gcc/testsuite/gcc.dg/stdckdint-2.c
@@ -1,6 +1,6 @@
 /* Test C23 Checked Integer Arithmetic macros in <stdckdint.h>.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 
 #include <stdckdint.h>
 
diff --git a/gcc/testsuite/gcc.dg/stdint-width-2.c b/gcc/testsuite/gcc.dg/stdint-width-2.c
index 9838cb2..a48333a 100644
--- a/gcc/testsuite/gcc.dg/stdint-width-2.c
+++ b/gcc/testsuite/gcc.dg/stdint-width-2.c
@@ -1,6 +1,6 @@
-/* Test C2X width macros in <stdint.h>.  */
+/* Test C23 width macros in <stdint.h>.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -ffreestanding" } */
+/* { dg-options "-std=c23 -ffreestanding" } */
 /* { dg-additional-options "-DSIGNAL_SUPPRESS" { target { ! signal } } } */
 
 #include <stddef.h>
diff --git a/gcc/testsuite/gcc.dg/tm/attrs-1.c b/gcc/testsuite/gcc.dg/tm/attrs-1.c
index a936747..b42308f 100644
--- a/gcc/testsuite/gcc.dg/tm/attrs-1.c
+++ b/gcc/testsuite/gcc.dg/tm/attrs-1.c
@@ -1,4 +1,4 @@
-/* Test various erroneous or ignored uses of C2X attribute syntax.  */
+/* Test various erroneous or ignored uses of C23 attribute syntax.  */
 /* { dg-do compile } */
 /* { dg-options "-fgnu-tm" } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-1.c b/gcc/testsuite/gcc.dg/torture/bitint-1.c
index ab0fc82..347e675 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-1.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-1.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-10.c b/gcc/testsuite/gcc.dg/torture/bitint-10.c
index 3aaf766..4a16bda 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-10.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-10.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-11.c b/gcc/testsuite/gcc.dg/torture/bitint-11.c
index 28af306..e40bb8b 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-11.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-11.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint && int32plus } } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-12.c b/gcc/testsuite/gcc.dg/torture/bitint-12.c
index f0180b1..66daece 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-12.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-12.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint && int32plus } } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-13.c b/gcc/testsuite/gcc.dg/torture/bitint-13.c
index 889986b..30bee08 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-13.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-13.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint && int32plus } } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-14.c b/gcc/testsuite/gcc.dg/torture/bitint-14.c
index d041055..b441e1c 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-14.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-14.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-15.c b/gcc/testsuite/gcc.dg/torture/bitint-15.c
index a009930..95f61bc 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-15.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-15.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-16.c b/gcc/testsuite/gcc.dg/torture/bitint-16.c
index 4cdfd19..7bf45c0 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-16.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-16.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-17.c b/gcc/testsuite/gcc.dg/torture/bitint-17.c
index 83304da..907f707 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-17.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-17.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-18.c b/gcc/testsuite/gcc.dg/torture/bitint-18.c
index 46f9e53..40d9841 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-18.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-18.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint && int32plus } } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-19.c b/gcc/testsuite/gcc.dg/torture/bitint-19.c
index d69a8a7..c123a8c 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-19.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-19.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint && int32plus } } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-2.c b/gcc/testsuite/gcc.dg/torture/bitint-2.c
index 0167782..9317745 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-2.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-2.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-20.c b/gcc/testsuite/gcc.dg/torture/bitint-20.c
index d575b37..f402868 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-20.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-20.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint && int32plus } } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-21.c b/gcc/testsuite/gcc.dg/torture/bitint-21.c
index 3b4847b..5f05a0b 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-21.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-21.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-22.c b/gcc/testsuite/gcc.dg/torture/bitint-22.c
index 98d3db0..dc8833a 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-22.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-22.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-23.c b/gcc/testsuite/gcc.dg/torture/bitint-23.c
index 855dcc6..4edd122 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-23.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-23.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-24.c b/gcc/testsuite/gcc.dg/torture/bitint-24.c
index 0671a96..d6edd0d 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-24.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-24.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-25.c b/gcc/testsuite/gcc.dg/torture/bitint-25.c
index 0a4e47e..c3cb26b 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-25.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-25.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target { bitint && float16_runtime } } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 /* { dg-add-options float16 } */
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-26.c b/gcc/testsuite/gcc.dg/torture/bitint-26.c
index 8181672..a4268db 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-26.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-26.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-27.c b/gcc/testsuite/gcc.dg/torture/bitint-27.c
index 3b0e576..98dd2f4 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-27.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-27.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-28.c b/gcc/testsuite/gcc.dg/torture/bitint-28.c
index 1308f93..66282ef 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-28.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-28.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-29.c b/gcc/testsuite/gcc.dg/torture/bitint-29.c
index 0e1532c..dd65dcf 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-29.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-29.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-3.c b/gcc/testsuite/gcc.dg/torture/bitint-3.c
index cf6c49f..5af3036 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-3.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-3.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-30.c b/gcc/testsuite/gcc.dg/torture/bitint-30.c
index f7482012..f8a421d 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-30.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-30.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-31.c b/gcc/testsuite/gcc.dg/torture/bitint-31.c
index 41c81f6..d557777 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-31.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-31.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-32.c b/gcc/testsuite/gcc.dg/torture/bitint-32.c
index 5c57ede..43ae334 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-32.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-32.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-33.c b/gcc/testsuite/gcc.dg/torture/bitint-33.c
index b10582b..cb4492d 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-33.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-33.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-34.c b/gcc/testsuite/gcc.dg/torture/bitint-34.c
index 03588d3..5728698 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-34.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-34.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-35.c b/gcc/testsuite/gcc.dg/torture/bitint-35.c
index 32ff233..a65e199 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-35.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-35.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-36.c b/gcc/testsuite/gcc.dg/torture/bitint-36.c
index 1290c5d..d6eecc1 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-36.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-36.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-37.c b/gcc/testsuite/gcc.dg/torture/bitint-37.c
index e0d43bc..32cb9a2 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-37.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-37.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-38.c b/gcc/testsuite/gcc.dg/torture/bitint-38.c
index 1c1f073..df3cad1 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-38.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-38.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-39.c b/gcc/testsuite/gcc.dg/torture/bitint-39.c
index 4d6956b..c6d59cb 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-39.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-39.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-4.c b/gcc/testsuite/gcc.dg/torture/bitint-4.c
index d53fb01..5f2274e 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-4.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-4.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-40.c b/gcc/testsuite/gcc.dg/torture/bitint-40.c
index 3f20e37..bb53637 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-40.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-40.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-41.c b/gcc/testsuite/gcc.dg/torture/bitint-41.c
index c74cff4..0928c26 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-41.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-41.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-42.c b/gcc/testsuite/gcc.dg/torture/bitint-42.c
index 10cd95b..86c5210 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-42.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-42.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-5.c b/gcc/testsuite/gcc.dg/torture/bitint-5.c
index 74e5428..2e1b079 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-5.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-5.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-6.c b/gcc/testsuite/gcc.dg/torture/bitint-6.c
index d87d1d2..348ae37 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-6.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-6.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-7.c b/gcc/testsuite/gcc.dg/torture/bitint-7.c
index 3f4b260..a60d9ed 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-7.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-7.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-8.c b/gcc/testsuite/gcc.dg/torture/bitint-8.c
index fc5be08..01fbdad 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-8.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-8.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/bitint-9.c b/gcc/testsuite/gcc.dg/torture/bitint-9.c
index 0e2bdd4..2c4651d 100644
--- a/gcc/testsuite/gcc.dg/torture/bitint-9.c
+++ b/gcc/testsuite/gcc.dg/torture/bitint-9.c
@@ -1,6 +1,6 @@
 /* PR c/102989 */
 /* { dg-do run { target bitint } } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-skip-if "" { ! run_expensive_tests }  { "*" } { "-O0" "-O2" } } */
 /* { dg-skip-if "" { ! run_expensive_tests } { "-flto" } { "" } } */
 
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
index 739a78c..431ee0b 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
@@ -1,6 +1,6 @@
-/* Test C2X enables -fno-fp-int-builtin-inexact.  */
+/* Test C23 enables -fno-fp-int-builtin-inexact.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x" } */
+/* { dg-options "-std=c23" } */
 /* { dg-require-effective-target fenv_exceptions } */
 
 #include "builtin-fp-int-inexact.c"
diff --git a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c b/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c
index f527b8232..d67f147 100644
--- a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c
+++ b/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c
@@ -1,8 +1,8 @@
-/* Test C2x variadic functions with no named parameters, or last named
+/* Test C23 variadic functions with no named parameters, or last named
    parameter with a declaration not allowed in C17.  Execution tests split
    between source files.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 /* { dg-additional-sources "c2x-stdarg-split-1b.c" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c b/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c
index 55a01b2..064da12 100644
--- a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c
+++ b/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c
@@ -1,8 +1,8 @@
-/* Test C2x variadic functions with no named parameters, or last named
+/* Test C23 variadic functions with no named parameters, or last named
    parameter with a declaration not allowed in C17.  Execution tests split
    between source files.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors" } */
+/* { dg-options "-std=c23 -pedantic-errors" } */
 
 #include <stdarg.h>
 
diff --git a/gcc/testsuite/gcc.dg/torture/float128-nan-floath.c b/gcc/testsuite/gcc.dg/torture/float128-nan-floath.c
index 69fd45a..6601434 100644
--- a/gcc/testsuite/gcc.dg/torture/float128-nan-floath.c
+++ b/gcc/testsuite/gcc.dg/torture/float128-nan-floath.c
@@ -1,6 +1,6 @@
 /* Test _Float128 NaNs in <float.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -fsignaling-nans" } */
+/* { dg-options "-std=c23 -fsignaling-nans" } */
 /* { dg-add-options float128 } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target float128_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/float128x-nan-floath.c b/gcc/testsuite/gcc.dg/torture/float128x-nan-floath.c
index 5be4c07..5460309 100644
--- a/gcc/testsuite/gcc.dg/torture/float128x-nan-floath.c
+++ b/gcc/testsuite/gcc.dg/torture/float128x-nan-floath.c
@@ -1,6 +1,6 @@
 /* Test _Float128x NaNs in <float.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -fsignaling-nans" } */
+/* { dg-options "-std=c23 -fsignaling-nans" } */
 /* { dg-add-options float128x } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target float128x_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/float16-nan-floath.c b/gcc/testsuite/gcc.dg/torture/float16-nan-floath.c
index cf03b45..1db221c 100644
--- a/gcc/testsuite/gcc.dg/torture/float16-nan-floath.c
+++ b/gcc/testsuite/gcc.dg/torture/float16-nan-floath.c
@@ -1,6 +1,6 @@
 /* Test _Float16 NaNs in <float.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -fsignaling-nans" } */
+/* { dg-options "-std=c23 -fsignaling-nans" } */
 /* { dg-add-options float16 } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target float16_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/float32-nan-floath.c b/gcc/testsuite/gcc.dg/torture/float32-nan-floath.c
index 2976a40..b0235c8 100644
--- a/gcc/testsuite/gcc.dg/torture/float32-nan-floath.c
+++ b/gcc/testsuite/gcc.dg/torture/float32-nan-floath.c
@@ -1,6 +1,6 @@
 /* Test _Float32 NaNs in <float.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -fsignaling-nans" } */
+/* { dg-options "-std=c23 -fsignaling-nans" } */
 /* { dg-add-options float32 } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target float32_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/float32x-nan-floath.c b/gcc/testsuite/gcc.dg/torture/float32x-nan-floath.c
index 8d58b41..bc8b7ec 100644
--- a/gcc/testsuite/gcc.dg/torture/float32x-nan-floath.c
+++ b/gcc/testsuite/gcc.dg/torture/float32x-nan-floath.c
@@ -1,6 +1,6 @@
 /* Test _Float32x NaNs in <float.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -fsignaling-nans" } */
+/* { dg-options "-std=c23 -fsignaling-nans" } */
 /* { dg-add-options float32x } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target float32x_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/float64-nan-floath.c b/gcc/testsuite/gcc.dg/torture/float64-nan-floath.c
index 444f234..ea7cd60 100644
--- a/gcc/testsuite/gcc.dg/torture/float64-nan-floath.c
+++ b/gcc/testsuite/gcc.dg/torture/float64-nan-floath.c
@@ -1,6 +1,6 @@
 /* Test _Float64 NaNs in <float.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -fsignaling-nans" } */
+/* { dg-options "-std=c23 -fsignaling-nans" } */
 /* { dg-add-options float64 } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target float64_runtime } */
diff --git a/gcc/testsuite/gcc.dg/torture/float64x-nan-floath.c b/gcc/testsuite/gcc.dg/torture/float64x-nan-floath.c
index fbc8676..f82b701 100644
--- a/gcc/testsuite/gcc.dg/torture/float64x-nan-floath.c
+++ b/gcc/testsuite/gcc.dg/torture/float64x-nan-floath.c
@@ -1,6 +1,6 @@
 /* Test _Float64x NaNs in <float.h>.  */
 /* { dg-do run } */
-/* { dg-options "-std=c2x -fsignaling-nans" } */
+/* { dg-options "-std=c23 -fsignaling-nans" } */
 /* { dg-add-options float64x } */
 /* { dg-add-options ieee } */
 /* { dg-require-effective-target float64x_runtime } */
diff --git a/gcc/testsuite/gcc.target/i386/excess-precision-11.c b/gcc/testsuite/gcc.target/i386/excess-precision-11.c
index b83ecae..22e1cde 100644
--- a/gcc/testsuite/gcc.target/i386/excess-precision-11.c
+++ b/gcc/testsuite/gcc.target/i386/excess-precision-11.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Valid code, compilation tests, excess precision.  */
+/* Test C23 constexpr.  Valid code, compilation tests, excess precision.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -mfpmath=387 -fexcess-precision=standard" } */
+/* { dg-options "-std=c23 -pedantic-errors -mfpmath=387 -fexcess-precision=standard" } */
 
 constexpr long double ld = 1.0 / 3.0;
 constexpr long double ld2 = 1.1;
diff --git a/gcc/testsuite/gcc.target/i386/excess-precision-12.c b/gcc/testsuite/gcc.target/i386/excess-precision-12.c
index b44f0b5..d73a208 100644
--- a/gcc/testsuite/gcc.target/i386/excess-precision-12.c
+++ b/gcc/testsuite/gcc.target/i386/excess-precision-12.c
@@ -1,6 +1,6 @@
-/* Test C2x constexpr.  Invalid code, compilation tests, excess precision.  */
+/* Test C23 constexpr.  Invalid code, compilation tests, excess precision.  */
 /* { dg-do compile } */
-/* { dg-options "-std=c2x -pedantic-errors -mfpmath=387 -fexcess-precision=standard" } */
+/* { dg-options "-std=c23 -pedantic-errors -mfpmath=387 -fexcess-precision=standard" } */
 
 constexpr double d = 1.0 / 3.0; /* { dg-error "'constexpr' initializer not representable in type of object" } */
 constexpr double d2 = 1.1; /* { dg-error "'constexpr' initializer not representable in type of object" } */
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 8f6cdf1..1a7bea9 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -3849,7 +3849,7 @@ proc check_effective_target_bitint { } {
     return [check_no_compiler_messages bitint object {
 	_BitInt (2) a = 1wb;
 	unsigned _BitInt (__BITINT_MAXWIDTH__) b = 0uwb;
-    } "-std=c2x"]
+    } "-std=c23"]
 }
 
 # Return 1 if the target supports _BitInt(128), 0 otherwise.
@@ -3858,7 +3858,7 @@ proc check_effective_target_bitint128 { } {
     return [check_no_compiler_messages bitint128 object {
 	_BitInt (2) a = 1wb;
 	unsigned _BitInt (128) b = 0uwb;
-    } "-std=c2x"]
+    } "-std=c23"]
 }
 
 # Return 1 if the target supports _BitInt(575), 0 otherwise.
@@ -3867,7 +3867,7 @@ proc check_effective_target_bitint575 { } {
     return [check_no_compiler_messages bitint575 object {
 	_BitInt (2) a = 1wb;
 	unsigned _BitInt (575) b = 0uwb;
-    } "-std=c2x"]
+    } "-std=c23"]
 }
 
 # Return 1 if the target supports compiling decimal floating point,
diff --git a/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m b/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m
index 7c72734..dedd53cd 100644
--- a/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m
+++ b/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m
@@ -1,5 +1,5 @@
-/* Test C2x attribute syntax.  Test empty attributes accepted.  */
+/* Test C23 attribute syntax.  Test empty attributes accepted.  */
 /* { dg-do compile } */
-/* { dg-options "-std=gnu2x" } */
+/* { dg-options "-std=gnu23" } */
 
 #include "../../gcc.dg/c2x-attr-syntax-1.c"
author	Joseph Myers <joseph@codesourcery.com>	2023-11-07 22:00:48 +0000
committer	Joseph Myers <joseph@codesourcery.com>	2023-11-07 22:00:48 +0000
commit	54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad (patch)
tree	2566b3808786f5d8d2eda5825d72e9b851e1d2b1
parent	2b61b8063b83c1764e43b547223372faee4bcfbd (diff)
download	gcc-54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad.zip gcc-54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad.tar.gz gcc-54bac0ce69b7a1c02b4cbb25d3d908a4ef59d5ad.tar.bz2