229 files changed, 17 insertions, 17 deletions
diff --git a/gcc/testsuite/g++.dg/cpp/elifdef-2.C b/gcc/testsuite/g++.dg/cpp/elifdef-2.C
index 6408271..7b339a4 100644
--- a/gcc/testsuite/g++.dg/cpp/elifdef-2.C
+++ b/gcc/testsuite/g++.dg/cpp/elifdef-2.C
@@ -1,4 +1,4 @@
 // P2334R1
 // { dg-do preprocess { target c++23 } }
 
-#include "../../gcc.dg/cpp/c2x-elifdef-1.c"
+#include "../../gcc.dg/cpp/c23-elifdef-1.c"
diff --git a/gcc/testsuite/g++.dg/cpp/elifdef-4.C b/gcc/testsuite/g++.dg/cpp/elifdef-4.C
index 08edf58..21599ae 100644
--- a/gcc/testsuite/g++.dg/cpp/elifdef-4.C
+++ b/gcc/testsuite/g++.dg/cpp/elifdef-4.C
@@ -2,4 +2,4 @@
 // { dg-do preprocess }
 // { dg-options "" }
 
-#include "../../gcc.dg/cpp/c2x-elifdef-1.c"
+#include "../../gcc.dg/cpp/c23-elifdef-1.c"
diff --git a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c b/gcc/testsuite/gcc.dg/atomic/c23-stdatomic-lockfree-char8_t.c
index 27af3bd..27af3bd 100644
--- a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-lockfree-char8_t.c
+++ b/gcc/testsuite/gcc.dg/atomic/c23-stdatomic-lockfree-char8_t.c
diff --git a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c b/gcc/testsuite/gcc.dg/atomic/c23-stdatomic-var-init-1.c
index 0780bb5..0780bb5 100644
--- a/gcc/testsuite/gcc.dg/atomic/c2x-stdatomic-var-init-1.c
+++ b/gcc/testsuite/gcc.dg/atomic/c23-stdatomic-var-init-1.c
diff --git a/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c b/gcc/testsuite/gcc.dg/atomic/gnu23-stdatomic-lockfree-char8_t.c
index 0d99b06..5fb03cc 100644
--- a/gcc/testsuite/gcc.dg/atomic/gnu2x-stdatomic-lockfree-char8_t.c
+++ b/gcc/testsuite/gcc.dg/atomic/gnu23-stdatomic-lockfree-char8_t.c
@@ -2,4 +2,4 @@
 /* { dg-do run } */
 /* { dg-options "-std=gnu23 -pedantic-errors" } */
 
-#include "c2x-stdatomic-lockfree-char8_t.c"
+#include "c23-stdatomic-lockfree-char8_t.c"
diff --git a/gcc/testsuite/gcc.dg/c11-float-dfp-1.c b/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
index 8d86b1b..1ff84b5 100644
--- a/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/c11-float-dfp-1.c
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=c11" } */
 
-#include "c2x-float-no-dfp-1.c"
+#include "c23-float-no-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/c11-float-dfp-2.c b/gcc/testsuite/gcc.dg/c11-float-dfp-2.c
index e63ebbc..aa2e9d0 100644
--- a/gcc/testsuite/gcc.dg/c11-float-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/c11-float-dfp-2.c
@@ -3,4 +3,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=c11" } */
 
-#include "c2x-float-no-dfp-3.c"
+#include "c23-float-no-dfp-3.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-align-1.c b/gcc/testsuite/gcc.dg/c23-align-1.c
index 840f97d..840f97d 100644
--- a/gcc/testsuite/gcc.dg/c2x-align-1.c
+++ b/gcc/testsuite/gcc.dg/c23-align-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-align-6.c b/gcc/testsuite/gcc.dg/c23-align-6.c
index bc3adcf..bc3adcf 100644
--- a/gcc/testsuite/gcc.dg/c2x-align-6.c
+++ b/gcc/testsuite/gcc.dg/c23-align-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-1.c
index 932336a..c1a5780 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-1.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-deprecated-1.c
@@ -2,7 +2,7 @@
 /* { dg-do compile } */
 /* { dg-options "-std=c23 -pedantic-errors" } */
 
-/* Similar to tests from gnu2x-attrs-1.c, but using the standard
+/* Similar to tests from gnu23-attrs-1.c, but using the standard
    attribute instead of gnu::deprecated, and sometimes using
    __deprecated__ or a string-literal argument.  */
 
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-2.c
index eb1e508..eb1e508 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-2.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-deprecated-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-3.c
index c305e9e..c305e9e 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-3.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-deprecated-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c b/gcc/testsuite/gcc.dg/c23-attr-deprecated-4.c
index aa0d8e5..aa0d8e5 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-deprecated-4.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-deprecated-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-1.c
index 4c13649..4c13649 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-1.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-2.c
index ec47321..ec47321 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-2.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-3.c
index 38da8a3..38da8a3 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-3.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-4.c
index 1f42517..1f42517 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-4.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-5.c
index 87d1f6e..87d1f6e 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-5.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-6.c
index 0984d67..0984d67 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-fallthrough-6.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-fallthrough-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-1.c
index 60562ae..60562ae 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-1.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-2.c
index c89a1b4..c89a1b4 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-2.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-3.c
index fe5d61a..fe5d61a 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-3.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-4.c
index 3a2a248..3a2a248 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-maybe_unused-4.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-maybe_unused-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-1.c
index 0740048..0740048 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-1.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-2.c
index 4441be4..4441be4 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-2.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-3.c
index 9573837..9573837 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-3.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-4.c
index 5add9de..5add9de 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-nodiscard-4.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-nodiscard-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c b/gcc/testsuite/gcc.dg/c23-attr-noreturn-1.c
index 7142635..7142635 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-1.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-noreturn-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c b/gcc/testsuite/gcc.dg/c23-attr-noreturn-2.c
index c6e0180..c6e0180 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-2.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-noreturn-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c b/gcc/testsuite/gcc.dg/c23-attr-noreturn-3.c
index a447b72..a447b72 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-noreturn-3.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-noreturn-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-1.c
index 9bca216..9bca216 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-1.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-syntax-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-2.c
index 36b6fc2..36b6fc2 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-2.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-syntax-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-3.c
index ffb7f11..ffb7f11 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-3.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-syntax-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-4.c
index 312d75e..312d75e 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-4.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-syntax-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-5.c
index 3088d02..3088d02 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-5.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-syntax-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-6.c
index ae1e757..ae1e757 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-6.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-syntax-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c b/gcc/testsuite/gcc.dg/c23-attr-syntax-7.c
index cf3b1ff..cf3b1ff 100644
--- a/gcc/testsuite/gcc.dg/c2x-attr-syntax-7.c
+++ b/gcc/testsuite/gcc.dg/c23-attr-syntax-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-1.c b/gcc/testsuite/gcc.dg/c23-auto-1.c
index fb3e845..fb3e845 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-1.c
+++ b/gcc/testsuite/gcc.dg/c23-auto-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-2.c b/gcc/testsuite/gcc.dg/c23-auto-2.c
index 4318e99..4318e99 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-2.c
+++ b/gcc/testsuite/gcc.dg/c23-auto-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-3.c b/gcc/testsuite/gcc.dg/c23-auto-3.c
index ab94c7a..ab94c7a 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-3.c
+++ b/gcc/testsuite/gcc.dg/c23-auto-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-auto-4.c b/gcc/testsuite/gcc.dg/c23-auto-4.c
index 9dd0e08..9dd0e08 100644
--- a/gcc/testsuite/gcc.dg/c2x-auto-4.c
+++ b/gcc/testsuite/gcc.dg/c23-auto-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-1.c b/gcc/testsuite/gcc.dg/c23-binary-constants-1.c
index 69b3f5d..69b3f5d 100644
--- a/gcc/testsuite/gcc.dg/c2x-binary-constants-1.c
+++ b/gcc/testsuite/gcc.dg/c23-binary-constants-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-2.c b/gcc/testsuite/gcc.dg/c23-binary-constants-2.c
index 46727df..46727df 100644
--- a/gcc/testsuite/gcc.dg/c2x-binary-constants-2.c
+++ b/gcc/testsuite/gcc.dg/c23-binary-constants-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-binary-constants-3.c b/gcc/testsuite/gcc.dg/c23-binary-constants-3.c
index ca80ea0..ca80ea0 100644
--- a/gcc/testsuite/gcc.dg/c2x-binary-constants-3.c
+++ b/gcc/testsuite/gcc.dg/c23-binary-constants-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-1.c b/gcc/testsuite/gcc.dg/c23-bool-1.c
index 6f56e03..6f56e03 100644
--- a/gcc/testsuite/gcc.dg/c2x-bool-1.c
+++ b/gcc/testsuite/gcc.dg/c23-bool-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-2.c b/gcc/testsuite/gcc.dg/c23-bool-2.c
index a919d0b..a919d0b 100644
--- a/gcc/testsuite/gcc.dg/c2x-bool-2.c
+++ b/gcc/testsuite/gcc.dg/c23-bool-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-bool-limits-1.c b/gcc/testsuite/gcc.dg/c23-bool-limits-1.c
index 5343113..5343113 100644
--- a/gcc/testsuite/gcc.dg/c2x-bool-limits-1.c
+++ b/gcc/testsuite/gcc.dg/c23-bool-limits-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-builtins-1.c b/gcc/testsuite/gcc.dg/c23-builtins-1.c
index 39f0ea4..39f0ea4 100644
--- a/gcc/testsuite/gcc.dg/c2x-builtins-1.c
+++ b/gcc/testsuite/gcc.dg/c23-builtins-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-1.c b/gcc/testsuite/gcc.dg/c23-complit-1.c
index c259d62..c259d62 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-1.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-2.c b/gcc/testsuite/gcc.dg/c23-complit-2.c
index 720b958..720b958 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-2.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-3.c b/gcc/testsuite/gcc.dg/c23-complit-3.c
index 310c142..310c142 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-3.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-4.c b/gcc/testsuite/gcc.dg/c23-complit-4.c
index 22ec19c..22ec19c 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-4.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-5.c b/gcc/testsuite/gcc.dg/c23-complit-5.c
index 27adb17..27adb17 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-5.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-6.c b/gcc/testsuite/gcc.dg/c23-complit-6.c
index 53a7abf7..53a7abf7 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-6.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-7.c b/gcc/testsuite/gcc.dg/c23-complit-7.c
index 1fca226..1fca226 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-7.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-complit-8.c b/gcc/testsuite/gcc.dg/c23-complit-8.c
index 56eb665..56eb665 100644
--- a/gcc/testsuite/gcc.dg/c2x-complit-8.c
+++ b/gcc/testsuite/gcc.dg/c23-complit-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-concat-1.c b/gcc/testsuite/gcc.dg/c23-concat-1.c
index 8b4c890..8b4c890 100644
--- a/gcc/testsuite/gcc.dg/c2x-concat-1.c
+++ b/gcc/testsuite/gcc.dg/c23-concat-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-1.c b/gcc/testsuite/gcc.dg/c23-constexpr-1.c
index e7eaf3d..e7eaf3d 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-1.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c b/gcc/testsuite/gcc.dg/c23-constexpr-2a.c
index 0989df4..a08097a 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-2a.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-2a.c
@@ -1,7 +1,7 @@
 /* Test C23 constexpr.  Valid code, execution test.  */
 /* { dg-do link } */
 /* { dg-options "-std=c23 -pedantic-errors" } */
-/* { dg-additional-sources "c2x-constexpr-2b.c" } */
+/* { dg-additional-sources "c23-constexpr-2b.c" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-2b.c b/gcc/testsuite/gcc.dg/c23-constexpr-2b.c
index bcdff32..bcdff32 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-2b.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-2b.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-3.c b/gcc/testsuite/gcc.dg/c23-constexpr-3.c
index 1429b12..1429b12 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-3.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-4.c b/gcc/testsuite/gcc.dg/c23-constexpr-4.c
index d4d6091..d4d6091 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-4.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-5.c b/gcc/testsuite/gcc.dg/c23-constexpr-5.c
index 5899ca1..5899ca1 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-5.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-6.c b/gcc/testsuite/gcc.dg/c23-constexpr-6.c
index a52851f..a52851f 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-6.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-7.c b/gcc/testsuite/gcc.dg/c23-constexpr-7.c
index 0c3101e..0c3101e 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-7.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-8.c b/gcc/testsuite/gcc.dg/c23-constexpr-8.c
index 02c039b..02c039b 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-8.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-constexpr-9.c b/gcc/testsuite/gcc.dg/c23-constexpr-9.c
index 1370583..1370583 100644
--- a/gcc/testsuite/gcc.dg/c2x-constexpr-9.c
+++ b/gcc/testsuite/gcc.dg/c23-constexpr-9.c
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-1.c b/gcc/testsuite/gcc.dg/c23-digit-separators-1.c
index 4b5f4f6..4b5f4f6 100644
--- a/gcc/testsuite/gcc.dg/c2x-digit-separators-1.c
+++ b/gcc/testsuite/gcc.dg/c23-digit-separators-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-2.c b/gcc/testsuite/gcc.dg/c23-digit-separators-2.c
index 30a9eb5..30a9eb5 100644
--- a/gcc/testsuite/gcc.dg/c2x-digit-separators-2.c
+++ b/gcc/testsuite/gcc.dg/c23-digit-separators-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-digit-separators-3.c b/gcc/testsuite/gcc.dg/c23-digit-separators-3.c
index e4d850f..e4d850f 100644
--- a/gcc/testsuite/gcc.dg/c2x-digit-separators-3.c
+++ b/gcc/testsuite/gcc.dg/c23-digit-separators-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-1.c b/gcc/testsuite/gcc.dg/c23-empty-init-1.c
index df0b007..df0b007 100644
--- a/gcc/testsuite/gcc.dg/c2x-empty-init-1.c
+++ b/gcc/testsuite/gcc.dg/c23-empty-init-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-2.c b/gcc/testsuite/gcc.dg/c23-empty-init-2.c
index 84a9e65..84a9e65 100644
--- a/gcc/testsuite/gcc.dg/c2x-empty-init-2.c
+++ b/gcc/testsuite/gcc.dg/c23-empty-init-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-empty-init-3.c b/gcc/testsuite/gcc.dg/c23-empty-init-3.c
index 6a14421..6a14421 100644
--- a/gcc/testsuite/gcc.dg/c2x-empty-init-3.c
+++ b/gcc/testsuite/gcc.dg/c23-empty-init-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-1.c b/gcc/testsuite/gcc.dg/c23-enum-1.c
index 3bf32b6..3bf32b6 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-1.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-2.c b/gcc/testsuite/gcc.dg/c23-enum-2.c
index 43cc8f8..43cc8f8 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-2.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-3.c b/gcc/testsuite/gcc.dg/c23-enum-3.c
index 191001d..191001d 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-3.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-4.c b/gcc/testsuite/gcc.dg/c23-enum-4.c
index 3d1f51b..3d1f51b 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-4.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-5.c b/gcc/testsuite/gcc.dg/c23-enum-5.c
index f39b1d2..f39b1d2 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-5.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-6.c b/gcc/testsuite/gcc.dg/c23-enum-6.c
index 976dcc6..976dcc6 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-6.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-7.c b/gcc/testsuite/gcc.dg/c23-enum-7.c
index c9ef088..c9ef088 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-7.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-enum-8.c b/gcc/testsuite/gcc.dg/c23-enum-8.c
index a241a3f..a241a3f 100644
--- a/gcc/testsuite/gcc.dg/c2x-enum-8.c
+++ b/gcc/testsuite/gcc.dg/c23-enum-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-1.c b/gcc/testsuite/gcc.dg/c23-float-1.c
index c13ad0d..c13ad0d 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-1.c
+++ b/gcc/testsuite/gcc.dg/c23-float-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-10.c b/gcc/testsuite/gcc.dg/c23-float-10.c
index d3d0359..d3d0359 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-10.c
+++ b/gcc/testsuite/gcc.dg/c23-float-10.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-11.c b/gcc/testsuite/gcc.dg/c23-float-11.c
index 17f42da..17f42da 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-11.c
+++ b/gcc/testsuite/gcc.dg/c23-float-11.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-12.c b/gcc/testsuite/gcc.dg/c23-float-12.c
index 04b3f05..04b3f05 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-12.c
+++ b/gcc/testsuite/gcc.dg/c23-float-12.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-13.c b/gcc/testsuite/gcc.dg/c23-float-13.c
index 9cfd7f0..9cfd7f0 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-13.c
+++ b/gcc/testsuite/gcc.dg/c23-float-13.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-2.c b/gcc/testsuite/gcc.dg/c23-float-2.c
index 65f3b59..65f3b59 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-2.c
+++ b/gcc/testsuite/gcc.dg/c23-float-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-3.c b/gcc/testsuite/gcc.dg/c23-float-3.c
index 23ab80f..23ab80f 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-3.c
+++ b/gcc/testsuite/gcc.dg/c23-float-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-4.c b/gcc/testsuite/gcc.dg/c23-float-4.c
index b4af9d3..b4af9d3 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-4.c
+++ b/gcc/testsuite/gcc.dg/c23-float-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-5.c b/gcc/testsuite/gcc.dg/c23-float-5.c
index 9c2f1bd..9c2f1bd 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-5.c
+++ b/gcc/testsuite/gcc.dg/c23-float-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-6.c b/gcc/testsuite/gcc.dg/c23-float-6.c
index 541fcd6..541fcd6 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-6.c
+++ b/gcc/testsuite/gcc.dg/c23-float-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7a.c b/gcc/testsuite/gcc.dg/c23-float-7a.c
index 3054949..3054949 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-7a.c
+++ b/gcc/testsuite/gcc.dg/c23-float-7a.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7b.c b/gcc/testsuite/gcc.dg/c23-float-7b.c
index 0075407..0075407 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-7b.c
+++ b/gcc/testsuite/gcc.dg/c23-float-7b.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-7c.c b/gcc/testsuite/gcc.dg/c23-float-7c.c
index b7455d9..b7455d9 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-7c.c
+++ b/gcc/testsuite/gcc.dg/c23-float-7c.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-8.c b/gcc/testsuite/gcc.dg/c23-float-8.c
index a1b141b..a1b141b 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-8.c
+++ b/gcc/testsuite/gcc.dg/c23-float-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-9.c b/gcc/testsuite/gcc.dg/c23-float-9.c
index eeb17d7..eeb17d7 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-9.c
+++ b/gcc/testsuite/gcc.dg/c23-float-9.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-1.c
index d6fa003..d6fa003 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/c23-float-no-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-2.c
index 25a2a97..bfe54d7 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/c23-float-no-dfp-2.c
@@ -6,4 +6,4 @@
 #define __STDC_WANT_DEC_FP__
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-no-dfp-1.c"
+#include "c23-float-no-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-3.c
index 3923649..3923649 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-3.c
+++ b/gcc/testsuite/gcc.dg/c23-float-no-dfp-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c b/gcc/testsuite/gcc.dg/c23-float-no-dfp-4.c
index 8518c0a..270dd31 100644
--- a/gcc/testsuite/gcc.dg/c2x-float-no-dfp-4.c
+++ b/gcc/testsuite/gcc.dg/c23-float-no-dfp-4.c
@@ -7,4 +7,4 @@
 #define __STDC_WANT_DEC_FP__
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-no-dfp-3.c"
+#include "c23-float-no-dfp-3.c"
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-1.c b/gcc/testsuite/gcc.dg/c23-floatn-1.c
index 0084a0c..0084a0c 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-1.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-2.c b/gcc/testsuite/gcc.dg/c23-floatn-2.c
index 808438a..808438a 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-2.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-3.c b/gcc/testsuite/gcc.dg/c23-floatn-3.c
index 0c12380..0c12380 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-3.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-4.c b/gcc/testsuite/gcc.dg/c23-floatn-4.c
index b1a21a0..b1a21a0 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-4.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-5.c b/gcc/testsuite/gcc.dg/c23-floatn-5.c
index 66d4541..66d4541 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-5.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-6.c b/gcc/testsuite/gcc.dg/c23-floatn-6.c
index 3480e90..3480e90 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-6.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-7.c b/gcc/testsuite/gcc.dg/c23-floatn-7.c
index 5a1acb1..5a1acb1 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-7.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-floatn-8.c b/gcc/testsuite/gcc.dg/c23-floatn-8.c
index ed6ac9b..ed6ac9b 100644
--- a/gcc/testsuite/gcc.dg/c2x-floatn-8.c
+++ b/gcc/testsuite/gcc.dg/c23-floatn-8.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-1.c b/gcc/testsuite/gcc.dg/c23-fordecl-1.c
index 2dc670c..2dc670c 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-1.c
+++ b/gcc/testsuite/gcc.dg/c23-fordecl-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-2.c b/gcc/testsuite/gcc.dg/c23-fordecl-2.c
index cd6c6ea..cd6c6ea 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-2.c
+++ b/gcc/testsuite/gcc.dg/c23-fordecl-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-3.c b/gcc/testsuite/gcc.dg/c23-fordecl-3.c
index 03849fb..03849fb 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-3.c
+++ b/gcc/testsuite/gcc.dg/c23-fordecl-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-fordecl-4.c b/gcc/testsuite/gcc.dg/c23-fordecl-4.c
index 09ae3b4..09ae3b4 100644
--- a/gcc/testsuite/gcc.dg/c2x-fordecl-4.c
+++ b/gcc/testsuite/gcc.dg/c23-fordecl-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-1.c
index b0adeaa..b0adeaa 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-1.c
+++ b/gcc/testsuite/gcc.dg/c23-has-c-attribute-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-2.c
index 3c5810a..3c5810a 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-2.c
+++ b/gcc/testsuite/gcc.dg/c23-has-c-attribute-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-3.c
index cd1a000..cd1a000 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-3.c
+++ b/gcc/testsuite/gcc.dg/c23-has-c-attribute-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c b/gcc/testsuite/gcc.dg/c23-has-c-attribute-4.c
index 72e7ee3..72e7ee3 100644
--- a/gcc/testsuite/gcc.dg/c2x-has-c-attribute-4.c
+++ b/gcc/testsuite/gcc.dg/c23-has-c-attribute-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-1.c b/gcc/testsuite/gcc.dg/c23-labels-1.c
index 0d9b663..0d9b663 100644
--- a/gcc/testsuite/gcc.dg/c2x-labels-1.c
+++ b/gcc/testsuite/gcc.dg/c23-labels-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-2.c b/gcc/testsuite/gcc.dg/c23-labels-2.c
index ceef503..ceef503 100644
--- a/gcc/testsuite/gcc.dg/c2x-labels-2.c
+++ b/gcc/testsuite/gcc.dg/c23-labels-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-labels-3.c b/gcc/testsuite/gcc.dg/c23-labels-3.c
index 2d75e34..2d75e34 100644
--- a/gcc/testsuite/gcc.dg/c2x-labels-3.c
+++ b/gcc/testsuite/gcc.dg/c23-labels-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-limits-1.c b/gcc/testsuite/gcc.dg/c23-limits-1.c
index 58b5bdf..58b5bdf 100644
--- a/gcc/testsuite/gcc.dg/c2x-limits-1.c
+++ b/gcc/testsuite/gcc.dg/c23-limits-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-no-dfp-1.c b/gcc/testsuite/gcc.dg/c23-no-dfp-1.c
index 10ed491..10ed491 100644
--- a/gcc/testsuite/gcc.dg/c2x-no-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/c23-no-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-1.c b/gcc/testsuite/gcc.dg/c23-nullptr-1.c
index a1b9dea..a1b9dea 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-1.c
+++ b/gcc/testsuite/gcc.dg/c23-nullptr-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-2.c b/gcc/testsuite/gcc.dg/c23-nullptr-2.c
index d7e4294..d7e4294 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-2.c
+++ b/gcc/testsuite/gcc.dg/c23-nullptr-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-3.c b/gcc/testsuite/gcc.dg/c23-nullptr-3.c
index f700624..f700624 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-3.c
+++ b/gcc/testsuite/gcc.dg/c23-nullptr-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-4.c b/gcc/testsuite/gcc.dg/c23-nullptr-4.c
index 578f999..578f999 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-4.c
+++ b/gcc/testsuite/gcc.dg/c23-nullptr-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-5.c b/gcc/testsuite/gcc.dg/c23-nullptr-5.c
index 54266af..54266af 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-5.c
+++ b/gcc/testsuite/gcc.dg/c23-nullptr-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-nullptr-6.c b/gcc/testsuite/gcc.dg/c23-nullptr-6.c
index 2ee2202..2ee2202 100644
--- a/gcc/testsuite/gcc.dg/c2x-nullptr-6.c
+++ b/gcc/testsuite/gcc.dg/c23-nullptr-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-1.c
index f204a3a..f204a3a 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-1.c
+++ b/gcc/testsuite/gcc.dg/c23-old-style-definition-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-2.c
index eae68a8..eae68a8 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-2.c
+++ b/gcc/testsuite/gcc.dg/c23-old-style-definition-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-3.c
index 9a880bc..9a880bc 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-3.c
+++ b/gcc/testsuite/gcc.dg/c23-old-style-definition-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-4.c
index 516efd0..516efd0 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-4.c
+++ b/gcc/testsuite/gcc.dg/c23-old-style-definition-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-5.c
index b0cf4ac..b0cf4ac 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-5.c
+++ b/gcc/testsuite/gcc.dg/c23-old-style-definition-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c b/gcc/testsuite/gcc.dg/c23-old-style-definition-6.c
index 4542034..4542034 100644
--- a/gcc/testsuite/gcc.dg/c2x-old-style-definition-6.c
+++ b/gcc/testsuite/gcc.dg/c23-old-style-definition-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-1.c b/gcc/testsuite/gcc.dg/c23-parm-omit-1.c
index 64e70b9..64e70b9 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-1.c
+++ b/gcc/testsuite/gcc.dg/c23-parm-omit-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-2.c b/gcc/testsuite/gcc.dg/c23-parm-omit-2.c
index 6ec44da..6ec44da 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-2.c
+++ b/gcc/testsuite/gcc.dg/c23-parm-omit-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-3.c b/gcc/testsuite/gcc.dg/c23-parm-omit-3.c
index 6e48410..6e48410 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-3.c
+++ b/gcc/testsuite/gcc.dg/c23-parm-omit-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-parm-omit-4.c b/gcc/testsuite/gcc.dg/c23-parm-omit-4.c
index 8063bdd..8063bdd 100644
--- a/gcc/testsuite/gcc.dg/c2x-parm-omit-4.c
+++ b/gcc/testsuite/gcc.dg/c23-parm-omit-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-1.c b/gcc/testsuite/gcc.dg/c23-qual-1.c
index 52ae87a..52ae87a 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-1.c
+++ b/gcc/testsuite/gcc.dg/c23-qual-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-2.c b/gcc/testsuite/gcc.dg/c23-qual-2.c
index 250776d..250776d 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-2.c
+++ b/gcc/testsuite/gcc.dg/c23-qual-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-3.c b/gcc/testsuite/gcc.dg/c23-qual-3.c
index 5afdcfd..5afdcfd 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-3.c
+++ b/gcc/testsuite/gcc.dg/c23-qual-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-4.c b/gcc/testsuite/gcc.dg/c23-qual-4.c
index 8a7a9f2..8a7a9f2 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-4.c
+++ b/gcc/testsuite/gcc.dg/c23-qual-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-5.c b/gcc/testsuite/gcc.dg/c23-qual-5.c
index 89b541a..89b541a 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-5.c
+++ b/gcc/testsuite/gcc.dg/c23-qual-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-6.c b/gcc/testsuite/gcc.dg/c23-qual-6.c
index d79423c..d79423c 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-6.c
+++ b/gcc/testsuite/gcc.dg/c23-qual-6.c
diff --git a/gcc/testsuite/gcc.dg/c2x-qual-7.c b/gcc/testsuite/gcc.dg/c23-qual-7.c
index d18fc34..d18fc34 100644
--- a/gcc/testsuite/gcc.dg/c2x-qual-7.c
+++ b/gcc/testsuite/gcc.dg/c23-qual-7.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-1.c b/gcc/testsuite/gcc.dg/c23-static-assert-1.c
index c3405e8..c3405e8 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-1.c
+++ b/gcc/testsuite/gcc.dg/c23-static-assert-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-2.c b/gcc/testsuite/gcc.dg/c23-static-assert-2.c
index 7533985..7533985 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-2.c
+++ b/gcc/testsuite/gcc.dg/c23-static-assert-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-3.c b/gcc/testsuite/gcc.dg/c23-static-assert-3.c
index d6b1188..d6b1188 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-3.c
+++ b/gcc/testsuite/gcc.dg/c23-static-assert-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-static-assert-4.c b/gcc/testsuite/gcc.dg/c23-static-assert-4.c
index 12744eb..12744eb 100644
--- a/gcc/testsuite/gcc.dg/c2x-static-assert-4.c
+++ b/gcc/testsuite/gcc.dg/c23-static-assert-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-1.c b/gcc/testsuite/gcc.dg/c23-stdarg-1.c
index 5155188..5155188 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-1.c
+++ b/gcc/testsuite/gcc.dg/c23-stdarg-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-2.c b/gcc/testsuite/gcc.dg/c23-stdarg-2.c
index 3499366..3499366 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-2.c
+++ b/gcc/testsuite/gcc.dg/c23-stdarg-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-3.c b/gcc/testsuite/gcc.dg/c23-stdarg-3.c
index 10d97db..10d97db 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-3.c
+++ b/gcc/testsuite/gcc.dg/c23-stdarg-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-4.c b/gcc/testsuite/gcc.dg/c23-stdarg-4.c
index cbbd9ef..cbbd9ef 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-4.c
+++ b/gcc/testsuite/gcc.dg/c23-stdarg-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdarg-5.c b/gcc/testsuite/gcc.dg/c23-stdarg-5.c
index 26fa859..26fa859 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdarg-5.c
+++ b/gcc/testsuite/gcc.dg/c23-stdarg-5.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c b/gcc/testsuite/gcc.dg/c23-stdatomic-1.c
index 022be6b..022be6b 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdatomic-1.c
+++ b/gcc/testsuite/gcc.dg/c23-stdatomic-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stddef-1.c b/gcc/testsuite/gcc.dg/c23-stddef-1.c
index 39cc5fb..39cc5fb 100644
--- a/gcc/testsuite/gcc.dg/c2x-stddef-1.c
+++ b/gcc/testsuite/gcc.dg/c23-stddef-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-stdint-1.c b/gcc/testsuite/gcc.dg/c23-stdint-1.c
index 9a984cf..9a984cf 100644
--- a/gcc/testsuite/gcc.dg/c2x-stdint-1.c
+++ b/gcc/testsuite/gcc.dg/c23-stdint-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-thread-local-1.c b/gcc/testsuite/gcc.dg/c23-thread-local-1.c
index 8b48313..8b48313 100644
--- a/gcc/testsuite/gcc.dg/c2x-thread-local-1.c
+++ b/gcc/testsuite/gcc.dg/c23-thread-local-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-thread-local-2.c b/gcc/testsuite/gcc.dg/c23-thread-local-2.c
index 1d063f0..1d063f0 100644
--- a/gcc/testsuite/gcc.dg/c2x-thread-local-2.c
+++ b/gcc/testsuite/gcc.dg/c23-thread-local-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-1.c b/gcc/testsuite/gcc.dg/c23-typeof-1.c
index cbc5f28..cbc5f28 100644
--- a/gcc/testsuite/gcc.dg/c2x-typeof-1.c
+++ b/gcc/testsuite/gcc.dg/c23-typeof-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-2.c b/gcc/testsuite/gcc.dg/c23-typeof-2.c
index 0c42a07..0c42a07 100644
--- a/gcc/testsuite/gcc.dg/c2x-typeof-2.c
+++ b/gcc/testsuite/gcc.dg/c23-typeof-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-typeof-3.c b/gcc/testsuite/gcc.dg/c23-typeof-3.c
index 824b3ef..824b3ef 100644
--- a/gcc/testsuite/gcc.dg/c2x-typeof-3.c
+++ b/gcc/testsuite/gcc.dg/c23-typeof-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-1.c b/gcc/testsuite/gcc.dg/c23-unproto-1.c
index 12957e2..12957e2 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-1.c
+++ b/gcc/testsuite/gcc.dg/c23-unproto-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-2.c b/gcc/testsuite/gcc.dg/c23-unproto-2.c
index c21a148..c21a148 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-2.c
+++ b/gcc/testsuite/gcc.dg/c23-unproto-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-3.c b/gcc/testsuite/gcc.dg/c23-unproto-3.c
index 6dc83dc..6dc83dc 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-3.c
+++ b/gcc/testsuite/gcc.dg/c23-unproto-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unproto-4.c b/gcc/testsuite/gcc.dg/c23-unproto-4.c
index 7321753..7321753 100644
--- a/gcc/testsuite/gcc.dg/c2x-unproto-4.c
+++ b/gcc/testsuite/gcc.dg/c23-unproto-4.c
diff --git a/gcc/testsuite/gcc.dg/c2x-unreachable-1.c b/gcc/testsuite/gcc.dg/c23-unreachable-1.c
index 4cbe7f0..4cbe7f0 100644
--- a/gcc/testsuite/gcc.dg/c2x-unreachable-1.c
+++ b/gcc/testsuite/gcc.dg/c23-unreachable-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-1.c b/gcc/testsuite/gcc.dg/c23-utf8char-1.c
index e5e8094..e5e8094 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8char-1.c
+++ b/gcc/testsuite/gcc.dg/c23-utf8char-1.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-2.c b/gcc/testsuite/gcc.dg/c23-utf8char-2.c
index 94ad6f3..94ad6f3 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8char-2.c
+++ b/gcc/testsuite/gcc.dg/c23-utf8char-2.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8char-3.c b/gcc/testsuite/gcc.dg/c23-utf8char-3.c
index e152edb..e152edb 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8char-3.c
+++ b/gcc/testsuite/gcc.dg/c23-utf8char-3.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8str-type.c b/gcc/testsuite/gcc.dg/c23-utf8str-type.c
index 36c5d01..36c5d01 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8str-type.c
+++ b/gcc/testsuite/gcc.dg/c23-utf8str-type.c
diff --git a/gcc/testsuite/gcc.dg/c2x-utf8str.c b/gcc/testsuite/gcc.dg/c23-utf8str.c
index 6efd97b..6efd97b 100644
--- a/gcc/testsuite/gcc.dg/c2x-utf8str.c
+++ b/gcc/testsuite/gcc.dg/c23-utf8str.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c b/gcc/testsuite/gcc.dg/cpp/c23-elifdef-1.c
index 0b49067..0b49067 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-elifdef-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c b/gcc/testsuite/gcc.dg/cpp/c23-elifdef-2.c
index 35eb4aa..35eb4aa 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-elifdef-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-elifdef-2.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c b/gcc/testsuite/gcc.dg/cpp/c23-scope-1.c
index 7a145ac..7a145ac 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-scope-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-scope-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c b/gcc/testsuite/gcc.dg/cpp/c23-scope-2.c
index a372b56..1304221 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-scope-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-scope-2.c
@@ -8,4 +8,4 @@
 /* This must have a space inserted between the two ':' tokens in
    preprocessed output.  */
 TEST()COLON()COLON()TEST()
-/* { dg-final { scan-file c2x-scope-2.i "ABC: :ABC" } } */
+/* { dg-final { scan-file c23-scope-2.i "ABC: :ABC" } } */
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c b/gcc/testsuite/gcc.dg/cpp/c23-trigraphs-1.c
index e0401ab..e0401ab 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-trigraphs-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c b/gcc/testsuite/gcc.dg/cpp/c23-trigraphs-2.c
index 673dda3..673dda3 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-trigraphs-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-trigraphs-2.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c b/gcc/testsuite/gcc.dg/cpp/c23-ucn-1.c
index f89cfc6..f89cfc6 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-ucn-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-ucn-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c b/gcc/testsuite/gcc.dg/cpp/c23-ucnid-1-utf8.c
index a216e77..a216e77 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1-utf8.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-ucnid-1-utf8.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c b/gcc/testsuite/gcc.dg/cpp/c23-ucnid-1.c
index cb811bc..cb811bc 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-ucnid-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-ucnid-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c b/gcc/testsuite/gcc.dg/cpp/c23-va-opt-1.c
index 8ce811b..8ce811b 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-va-opt-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-va-opt-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c b/gcc/testsuite/gcc.dg/cpp/c23-warning-1.c
index cac3a6f..cac3a6f 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-warning-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-warning-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c b/gcc/testsuite/gcc.dg/cpp/c23-warning-2.c
index bfa52b4..bfa52b4 100644
--- a/gcc/testsuite/gcc.dg/cpp/c2x-warning-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/c23-warning-2.c
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c b/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c
index efcfbc9..706ed0f 100644
--- a/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/gnu11-elifdef-1.c
@@ -2,4 +2,4 @@
 /* { dg-do preprocess } */
 /* { dg-options "-std=gnu11" } */
 
-#include "c2x-elifdef-1.c"
+#include "c23-elifdef-1.c"
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c b/gcc/testsuite/gcc.dg/cpp/gnu23-warning-1.c
index 7376b8f..7376b8f 100644
--- a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/gnu23-warning-1.c
diff --git a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c b/gcc/testsuite/gcc.dg/cpp/gnu23-warning-2.c
index c5c4b3d..c5c4b3d 100644
--- a/gcc/testsuite/gcc.dg/cpp/gnu2x-warning-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/gnu23-warning-2.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c23-builtins-dfp-1.c
index c078e8e..c078e8e 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-builtins-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-builtins-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c b/gcc/testsuite/gcc.dg/dfp/c23-constants-1.c
index acd9640..acd9640 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constants-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-constants-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c b/gcc/testsuite/gcc.dg/dfp/c23-constants-2.c
index d98aba4..d98aba4 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constants-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-constants-2.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-1.c
index d7e7c90..d7e7c90 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c b/gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-2.c
index 9c0fc9d..9c0fc9d 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-constexpr-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-constexpr-dfp-2.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-1.c
index 1ab650b..1ab650b 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-2.c
index 1b3e693..96e8515 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-2.c
@@ -5,4 +5,4 @@
 
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-dfp-1.c"
+#include "c23-float-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-3.c
index 8fb4058..8fb4058 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-3.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-3.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-4.c
index d7d04bd..d7d04bd 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-4.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-4.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-5.c
index 19a5fbb..19a5fbb 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-5.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-5.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-6.c
index d00c390..d00c390 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-6.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-6.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-7.c
index bc1cd4b..bc1cd4b 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-7.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-7.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-8.c
index 06bbfa5..06bbfa5 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-float-dfp-8.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-float-dfp-8.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c b/gcc/testsuite/gcc.dg/dfp/c23-keywords-1.c
index 9e7f4d9..9e7f4d9 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-1.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-keywords-1.c
diff --git a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c b/gcc/testsuite/gcc.dg/dfp/c23-keywords-2.c
index 26cefd7..26cefd7 100644
--- a/gcc/testsuite/gcc.dg/dfp/c2x-keywords-2.c
+++ b/gcc/testsuite/gcc.dg/dfp/c23-keywords-2.c
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 e43ecac..6a40523 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
@@ -5,4 +5,4 @@
 
 #define __STDC_WANT_IEC_60559_DFP_EXT__
 
-#include "c2x-float-dfp-1.c"
+#include "c23-float-dfp-1.c"
diff --git a/gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c b/gcc/testsuite/gcc.dg/format/c23-dfp-printf-1.c
index 56707c4..56707c4 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-dfp-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c23-dfp-printf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c b/gcc/testsuite/gcc.dg/format/c23-dfp-scanf-1.c
index d295904..d295904 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-dfp-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c23-dfp-scanf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-printf-1.c b/gcc/testsuite/gcc.dg/format/c23-printf-1.c
index 4e50bfe..4e50bfe 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-printf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c23-printf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-scanf-1.c b/gcc/testsuite/gcc.dg/format/c23-scanf-1.c
index e1c69af..e1c69af 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-scanf-1.c
+++ b/gcc/testsuite/gcc.dg/format/c23-scanf-1.c
diff --git a/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c b/gcc/testsuite/gcc.dg/format/c23-strftime-1.c
index 80f2788..80f2788 100644
--- a/gcc/testsuite/gcc.dg/format/c2x-strftime-1.c
+++ b/gcc/testsuite/gcc.dg/format/c23-strftime-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c b/gcc/testsuite/gcc.dg/gnu23-attr-syntax-1.c
index 2576089..2576089 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-attr-syntax-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c b/gcc/testsuite/gcc.dg/gnu23-attr-syntax-2.c
index ba60f7a..ba60f7a 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attr-syntax-2.c
+++ b/gcc/testsuite/gcc.dg/gnu23-attr-syntax-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attrs-1.c b/gcc/testsuite/gcc.dg/gnu23-attrs-1.c
index 67ab483..67ab483 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attrs-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-attrs-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-attrs-2.c b/gcc/testsuite/gcc.dg/gnu23-attrs-2.c
index bcdfcf8..bcdfcf8 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-attrs-2.c
+++ b/gcc/testsuite/gcc.dg/gnu23-attrs-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-auto-1.c b/gcc/testsuite/gcc.dg/gnu23-auto-1.c
index 82d3d3d..82d3d3d 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-auto-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-auto-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c b/gcc/testsuite/gcc.dg/gnu23-builtins-no-dfp-1.c
index 9fa25f0..9fa25f0 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-builtins-no-dfp-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-builtins-no-dfp-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-complit-1.c b/gcc/testsuite/gcc.dg/gnu23-complit-1.c
index 6bee02c..6bee02c 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-complit-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-complit-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-complit-2.c b/gcc/testsuite/gcc.dg/gnu23-complit-2.c
index 4f36d81..4f36d81 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-complit-2.c
+++ b/gcc/testsuite/gcc.dg/gnu23-complit-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c b/gcc/testsuite/gcc.dg/gnu23-constexpr-1.c
index 834f90e..834f90e 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-constexpr-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-constexpr-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c b/gcc/testsuite/gcc.dg/gnu23-empty-init-1.c
index 2933041..2933041 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-empty-init-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-empty-init-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c b/gcc/testsuite/gcc.dg/gnu23-empty-init-2.c
index f73d018..f73d018 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-empty-init-2.c
+++ b/gcc/testsuite/gcc.dg/gnu23-empty-init-2.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-enum-1.c b/gcc/testsuite/gcc.dg/gnu23-enum-1.c
index 797e416..797e416 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-enum-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-enum-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c b/gcc/testsuite/gcc.dg/gnu23-static-assert-1.c
index 2f84f47..2f84f47 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-static-assert-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-static-assert-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c b/gcc/testsuite/gcc.dg/gnu23-stdarg-1.c
index 0a78b22..0a78b22 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-stdarg-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-stdarg-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-typeof-1.c b/gcc/testsuite/gcc.dg/gnu23-typeof-1.c
index 399b8e1..399b8e1 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-typeof-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-typeof-1.c
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c b/gcc/testsuite/gcc.dg/gnu23-utf8char-1.c
index 206ff23..f5e1349 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8char-1.c
+++ b/gcc/testsuite/gcc.dg/gnu23-utf8char-1.c
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu23" } */
 
-#include "c2x-utf8char-1.c"
+#include "c23-utf8char-1.c"
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c b/gcc/testsuite/gcc.dg/gnu23-utf8str-type.c
index 7b5ccb0..95440e38 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8str-type.c
+++ b/gcc/testsuite/gcc.dg/gnu23-utf8str-type.c
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu23" } */
 
-#include "c2x-utf8str-type.c"
+#include "c23-utf8str-type.c"
diff --git a/gcc/testsuite/gcc.dg/gnu2x-utf8str.c b/gcc/testsuite/gcc.dg/gnu23-utf8str.c
index 4e52822..4e52822 100644
--- a/gcc/testsuite/gcc.dg/gnu2x-utf8str.c
+++ b/gcc/testsuite/gcc.dg/gnu23-utf8str.c
diff --git a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c23.c
index 431ee0b..431ee0b 100644
--- a/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c2x.c
+++ b/gcc/testsuite/gcc.dg/torture/builtin-fp-int-inexact-c23.c
diff --git a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c b/gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1a.c
index d67f147..2dff792 100644
--- a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1a.c
+++ b/gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1a.c
@@ -3,7 +3,7 @@
    between source files.  */
 /* { dg-do run } */
 /* { dg-options "-std=c23 -pedantic-errors" } */
-/* { dg-additional-sources "c2x-stdarg-split-1b.c" } */
+/* { dg-additional-sources "c23-stdarg-split-1b.c" } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c b/gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1b.c
index 064da12..064da12 100644
--- a/gcc/testsuite/gcc.dg/torture/c2x-stdarg-split-1b.c
+++ b/gcc/testsuite/gcc.dg/torture/c23-stdarg-split-1b.c
diff --git a/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m b/gcc/testsuite/objc.dg/attributes/gnu23-attr-syntax-1.m
index dedd53cd..d72d83a 100644
--- a/gcc/testsuite/objc.dg/attributes/gnu2x-attr-syntax-1.m
+++ b/gcc/testsuite/objc.dg/attributes/gnu23-attr-syntax-1.m
@@ -2,4 +2,4 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu23" } */
 
-#include "../../gcc.dg/c2x-attr-syntax-1.c"
+#include "../../gcc.dg/c23-attr-syntax-1.c"