Move gating tests to a different repo

Remove the gating tests from here and use the tests from https://src.fedoraproject.org/tests/gcc There's more of them there, they are are more up-to-date, maintained by RHEL QA staff and re-used in other downstreams (CentOS Stream, RHEL, RHIVOS).
12.3.1-1
2023-11-09 11:23:01 +01:00 · 2023-05-08 21:48:26 +02:00 · 2023-05-08 21:18:00 +02:00
25 changed files with 2224 additions and 1533 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,32 +1,83 @@
+/gcc-10.0.1-20200118.tar.xz
+/newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz
+/nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz
+/gcc-10.0.1-20200121.tar.xz
+/gcc-10.0.1-20200123.tar.xz
+/gcc-10.0.1-20200126.tar.xz
+/gcc-10.0.1-20200130.tar.xz
+/gcc-10.0.1-20200216.tar.xz
+/gcc-10.0.1-20200311.tar.xz
+/gcc-10.0.1-20200325.tar.xz
+/gcc-10.0.1-20200328.tar.xz
+/gcc-10.0.1-20200420.tar.xz
+/gcc-10.0.1-20200501.tar.xz
+/gcc-10.1.1-20200507.tar.xz
+/gcc-10.1.1-20200618.tar.xz
+/gcc-10.2.1-20200723.tar.xz
+/gcc-10.2.1-20200804.tar.xz
+/gcc-10.2.1-20200826.tar.xz
+/gcc-10.2.1-20200916.tar.xz
+/gcc-10.2.1-20201005.tar.xz
+/gcc-10.2.1-20201016.tar.xz
+/gcc-10.2.1-20201102.tar.xz
+/gcc-10.2.1-20201112.tar.xz
+/gcc-10.2.1-20201125.tar.xz
+/gcc-11.0.0-20201204.tar.xz
+/gcc-11.0.0-20201216.tar.xz
+/gcc-11.0.0-20201217.tar.xz
+/gcc-11.0.0-20201223.tar.xz
+/gcc-11.0.0-20210109.tar.xz
+/gcc-11.0.0-20210113.tar.xz
+/gcc-11.0.0-20210116.tar.xz
+/gcc-11.0.0-20210119.tar.xz
+/gcc-11.0.0-20210123.tar.xz
+/gcc-11.0.0-20210130.tar.xz
+/gcc-11.0.0-20210210.tar.xz
+/gcc-11.0.0-20210225.tar.xz
+/gcc-11.0.1-20210307.tar.xz
+/gcc-11.0.1-20210319.tar.xz
+/isl-0.18.tar.bz2
+/gcc-11.0.1-20210324.tar.xz
+/gcc-11.0.1-20210405.tar.xz
+/gcc-11.0.1-20210418.tar.xz
+/gcc-11.0.1-20210422.tar.xz
+/gcc-11.0.1-20210423.tar.xz
+/gcc-11.1.1-20210428.tar.xz
+/gcc-11.1.1-20210512.tar.xz
+/gcc-11.1.1-20210531.tar.xz
+/gcc-11.1.1-20210617.tar.xz
+/gcc-11.1.1-20210623.tar.xz
+/gcc-11.1.1-20210726.tar.xz
+/gcc-11.2.1-20210728.tar.xz
+/gcc-11.2.1-20210823.tar.xz
+/gcc-11.2.1-20211012.tar.xz
+/gcc-11.2.1-20211018.tar.xz
+/gcc-11.2.1-20211019.tar.xz
+/gcc-11.2.1-20211203.tar.xz
+/gcc-12.0.0-20220108.tar.xz
+/gcc-12.0.0-20220112.tar.xz
+/gcc-12.0.0-20220115.tar.xz
+/gcc-12.0.1-20220118.tar.xz
+/gcc-12.0.1-20220125.tar.xz
+/gcc-12.0.1-20220129.tar.xz
+/gcc-12.0.1-20220202.tar.xz
+/gcc-12.0.1-20220205.tar.xz
+/gcc-12.0.1-20220212.tar.xz
+/gcc-12.0.1-20220214.tar.xz
+/gcc-12.0.1-20220222.tar.xz
+/gcc-12.0.1-20220306.tar.xz
+/gcc-12.0.1-20220308.tar.xz
+/gcc-12.0.1-20220401.tar.xz
+/gcc-12.0.1-20220411.tar.xz
+/gcc-12.0.1-20220413.tar.xz
+/gcc-12.0.1-20220429.tar.xz
+/gcc-12.1.1-20220507.tar.xz
+/gcc-12.1.1-20220628.tar.xz
+/gcc-12.1.1-20220810.tar.xz
+/gcc-12.2.1-20220819.tar.xz
+/gcc-12.2.1-20221103.tar.xz
 /isl-0.24.tar.bz2
-/nvptx-tools-87ce9dc5999e5fca2e1d3478a30888d9864c9804.tar.xz
-/newlib-cygwin-2e4db338ac125579d555aeee516e48588a628a16.tar.xz
-/gcc-15.0.1-20250201.tar.xz
-/gcc-15.0.1-20250204.tar.xz
-/gcc-15.0.1-20250225.tar.xz
-/gcc-15.0.1-20250301.tar.xz
-/gcc-15.0.1-20250313.tar.xz
-/gcc-15.0.1-20250329.tar.xz
-/gcc-15.0.1-20250410.tar.xz
-/newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz
-/gcc-15.0.1-20250417.tar.xz
-/gcc-15.0.1-20250418.tar.xz
-/gcc-15.1.1-20250425.tar.xz
-/gcc-15.1.1-20250521.tar.xz
-/gcc-15.1.1-20250707.tar.xz
-/gcc-15.1.1-20250718.tar.xz
-/gcc-15.1.1-20250719.tar.xz
-/gcc-15.2.1-20250808.tar.xz
-/nvptx-tools-a0c1fff6534a4df9fb17937c3c4a4b1071212029.tar.xz
-/gcc-15.2.1-20250924.tar.xz
-/gcc-15.2.1-20251022.tar.xz
-/gcc-15.2.1-20251111.tar.xz
-/gcc-15.2.1-20251211.tar.xz
-/gcc-16.0.0-20251218.tar.xz
-/gcc-16.0.0-20251220.tar.xz
-/gcc-16.0.0-20260103.tar.xz
-/gcc-16.0.0-20260110.tar.xz
-/gcc-16.0.0-20260112.tar.xz
-/gcc-16.0.1-20260112.tar.xz
-/gcc-16.0.1-20260113.tar.xz
-/gcc-16.0.1-20260115.tar.xz
+/newlib-cygwin-a8526cb52bedabd4d6ba4b227a5185627f871aa1.tar.xz
+/nvptx-tools-472b6e78b3ba918d727698f79911360b7c808247.tar.xz
+/gcc-12.2.1-20221121.tar.xz
+/gcc-12.3.1-20230508.tar.xz
--- a/gcc.spec
+++ b/gcc.spec
--- a/gcc12-Wno-format-security.patch
+++ b/gcc12-Wno-format-security.patch
@ -9,15 +9,15 @@
 	* configure: Regenerated.

 --- gcc/configure.ac.jj	2017-02-13 12:20:53.000000000 +0100
-+++ gcc/configure.ac	2024-11-30 13:34:11.100296256 +0100
-@@ -592,7 +592,7 @@ AC_ARG_ENABLE(build-format-warnings,
+++ gcc/configure.ac	2017-02-25 12:42:32.859175403 +0100
+@@ -570,7 +570,7 @@ AC_ARG_ENABLE(build-format-warnings,
   AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
   [],[enable_build_format_warnings=yes])
 AS_IF([test $enable_build_format_warnings = no],
 -      [wf_opt=-Wno-format],[wf_opt=])
 +      [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
 ACX_PROG_CXX_WARNING_OPTS(
- 	m4_quote(m4_do([-W -Wall -Wno-error=narrowing -Wwrite-strings ],
+ 	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
 		       [-Wcast-qual $wf_opt])),
 --- gcc/configure.jj	2017-02-13 12:20:52.000000000 +0100
 +++ gcc/configure	2017-02-25 12:42:50.041946391 +0100
@ -30,37 +30,29 @@
 else
   wf_opt=
 fi
--- Makefile.tpl.jj	2023-11-29 13:21:41.680292662 +0100
-+++ Makefile.tpl	2024-11-30 13:35:29.303196246 +0100
-@@ -450,10 +450,10 @@ LDFLAGS = @LDFLAGS@
+--- Makefile.tpl.jj	2021-12-30 15:12:42.188164847 +0100
+++ Makefile.tpl	2022-01-07 12:06:12.115550714 +0100
+@@ -447,8 +447,8 @@ LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 -GOCFLAGS = $(CFLAGS)
-A68FLAGS = @A68FLAGS@
-GDCFLAGS = @GDCFLAGS@
-GM2FLAGS = $(CFLAGS)
+-GDCFLAGS = $(CFLAGS)
 +GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
-+A68FLAGS = $(filter-out -Wformat-security,@A68FLAGS@)
-+GDCFLAGS = $(filter-out -Wformat-security,@GDCFLAGS@)
-+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS))
+GDCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
 
- CRAB1_LIBS = @CRAB1_LIBS@
- 
--- Makefile.in.jj	2023-11-29 13:21:41.691292507 +0100
-+++ Makefile.in	2024-11-30 13:36:12.113594079 +0100
-@@ -447,10 +447,10 @@ LDFLAGS = @LDFLAGS@
+ # Pass additional PGO and LTO compiler options to the PGO build.
+ BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
+--- Makefile.in.jj	2021-12-30 15:12:42.188164847 +0100
+++ Makefile.in	2022-01-07 12:06:27.335334561 +0100
+@@ -444,8 +444,8 @@ LDFLAGS = @LDFLAGS@
 LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 -GOCFLAGS = $(CFLAGS)
-A68FLAGS = @A68FLAGS@
-GDCFLAGS = @GDCFLAGS@
-GM2FLAGS = $(CFLAGS)
+-GDCFLAGS = $(CFLAGS)
 +GOCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
-+A68FLAGS = $(filter-out -Wformat-security,@A68FLAGS@)
-+GDCFLAGS = $(filter-out -Wformat-security,@GDCFLAGS@)
-+GM2FLAGS = $(filter-out -Wformat-security,$(CFLAGS))
- 
- CRAB1_LIBS = @CRAB1_LIBS@
+GDCFLAGS = $(filter-out -Wformat-security,$(CFLAGS))
 
+ # Pass additional PGO and LTO compiler options to the PGO build.
+ BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
--- a/gcc12-d-shared-libphobos.patch
+++ b/gcc12-d-shared-libphobos.patch
--- a/gcc12-fortran-fdec-duplicates.patch
+++ b/gcc12-fortran-fdec-duplicates.patch
--- a/gcc12-fortran-fdec-non-logical-if.patch
+++ b/gcc12-fortran-fdec-non-logical-if.patch
@ -0,0 +1,378 @@
+From cc87ddb841017bb0976b05091733609ee17d7f05 Mon Sep 17 00:00:00 2001
+From: Mark Eggleston <markeggleston@gcc.gnu.org>
+Date: Fri, 22 Jan 2021 13:15:17 +0000
+Subject: [PATCH 07/10] Allow non-logical expressions in IF statements
+
+Use -fdec-non-logical-if to enable feature. Also enabled using -fdec.
+---
+ gcc/fortran/lang.opt                          |  4 ++
+ gcc/fortran/options.cc                        |  1 +
+ gcc/fortran/resolve.cc                        | 60 ++++++++++++++++---
+ ...gical_expressions_if_statements_blocks_1.f | 25 ++++++++
+ ...gical_expressions_if_statements_blocks_2.f | 25 ++++++++
+ ...gical_expressions_if_statements_blocks_3.f | 25 ++++++++
+ ...gical_expressions_if_statements_blocks_4.f | 45 ++++++++++++++
+ ...gical_expressions_if_statements_blocks_5.f | 45 ++++++++++++++
+ ...gical_expressions_if_statements_blocks_6.f | 45 ++++++++++++++
+ 9 files changed, 266 insertions(+), 9 deletions(-)
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
+
+diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
+index 4a269ebb22d..d886c2f33ed 100644
+--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
+@@ -506,6 +506,10 @@ fdec-override-kind
+ Fortran Var(flag_dec_override_kind)
+ Enable support for per variable kind specification.
+ 
+fdec-non-logical-if
+Fortran Var(flag_dec_non_logical_if)
+Enable support for non-logical expressions in if statements.
+
+ fdec-structure
+ Fortran Var(flag_dec_structure)
+ Enable support for DEC STRUCTURE/RECORD.
+diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc
+index edbab483b36..a946c86790a 100644
+--- a/gcc/fortran/options.cc
+++ b/gcc/fortran/options.cc
+@@ -79,6 +79,7 @@ set_dec_flags (int value)
+   SET_BITFLAG (flag_dec_char_conversions, value, value);
+   SET_BITFLAG (flag_dec_duplicates, value, value);
+   SET_BITFLAG (flag_dec_override_kind, value, value);
+  SET_BITFLAG (flag_dec_non_logical_if, value, value);
+ }
+ 
+ /* Finalize DEC flags.  */
+diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
+index bc0df0fdb99..07dd039f3bf 100644
+--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
+@@ -10789,10 +10789,31 @@ gfc_resolve_blocks (gfc_code *b, gfc_namespace *ns)
+       switch (b->op)
+ 	{
+ 	case EXEC_IF:
+-	  if (t && b->expr1 != NULL
+-	      && (b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0))
+-	    gfc_error ("IF clause at %L requires a scalar LOGICAL expression",
+-		       &b->expr1->where);
+	  if (t && b->expr1 != NULL)
+	    {
+	      if (flag_dec_non_logical_if && b->expr1->ts.type != BT_LOGICAL)
+		{
+		  gfc_expr* cast;
+		  cast = gfc_ne (b->expr1,
+				 gfc_get_int_expr (1, &gfc_current_locus, 0),
+				 INTRINSIC_NE);
+		  if (cast == NULL)
+		    gfc_internal_error ("gfc_resolve_blocks(): Failed to cast "
+					"to LOGICAL in IF");
+		  b->expr1 = cast;
+		  if (warn_conversion_extra)
+		    {
+		      gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in"
+				   " IF statement condition %L will be true if"
+				   " it evaluates to nonzero",
+				   &b->expr1->where);
+		    }
+		}
+
+	      if ((b->expr1->ts.type != BT_LOGICAL || b->expr1->rank != 0))
+		gfc_error ("IF clause at %L requires a scalar LOGICAL "
+			   "expression", &b->expr1->where);
+	    }
+ 	  break;
+ 
+ 	case EXEC_WHERE:
+@@ -12093,11 +12114,32 @@ start:
+ 	  break;
+ 
+ 	case EXEC_IF:
+-	  if (t && code->expr1 != NULL
+-	      && (code->expr1->ts.type != BT_LOGICAL
+-		  || code->expr1->rank != 0))
+-	    gfc_error ("IF clause at %L requires a scalar LOGICAL expression",
+-		       &code->expr1->where);
+	  if (t && code->expr1 != NULL)
+	    {
+	      if (flag_dec_non_logical_if
+		  && code->expr1->ts.type != BT_LOGICAL)
+		{
+		  gfc_expr* cast;
+		  cast = gfc_ne (code->expr1,
+				 gfc_get_int_expr (1, &gfc_current_locus, 0),
+				 INTRINSIC_NE);
+		  if (cast == NULL)
+		    gfc_internal_error ("gfc_resolve_code(): Failed to cast "
+					"to LOGICAL in IF");
+		  code->expr1 = cast;
+		  if (warn_conversion_extra)
+		    {
+		      gfc_warning (OPT_Wconversion_extra, "Non-LOGICAL type in"
+				   " IF statement condition %L will be true if"
+				   " it evaluates to nonzero",
+				   &code->expr1->where);
+		    }
+		}
+
+	      if (code->expr1->ts.type != BT_LOGICAL || code->expr1->rank != 0)
+		gfc_error ("IF clause at %L requires a scalar LOGICAL "
+			   "expression", &code->expr1->where);
+	    }
+ 	  break;
+ 
+ 	case EXEC_CALL:
+diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
+new file mode 100644
+index 00000000000..0101db893ca
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_1.f
+@@ -0,0 +1,25 @@
+! { dg-do run }
+! { dg-options "-fdec -Wconversion-extra" }
+!
+! Allow logical expressions in if statements and blocks
+!
+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
+!             and Jeff Law <law@redhat.com>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        PROGRAM logical_exp_if_st_bl
+          INTEGER ipos/1/
+          INTEGER ineg/0/
+
+          ! Test non logical variables
+          if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" }
+          if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" }
+
+          ! Test non logical expressions in if statements
+          if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" }
+
+          ! Test non logical expressions in if blocks
+          if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" }
+            STOP 4
+          endif
+        END
+diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
+new file mode 100644
+index 00000000000..876f4e09508
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_2.f
+@@ -0,0 +1,25 @@
+! { dg-do run }
+! { dg-options "-fdec-non-logical-if -Wconversion-extra" }
+!
+! Allow logical expressions in if statements and blocks
+!
+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
+!             and Jeff Law <law@redhat.com>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        PROGRAM logical_exp_if_st_bl
+          INTEGER ipos/1/
+          INTEGER ineg/0/
+
+          ! Test non logical variables
+          if (ineg) STOP 1 ! { dg-warning "if it evaluates to nonzero" }
+          if (0) STOP 2 ! { dg-warning "if it evaluates to nonzero" }
+
+          ! Test non logical expressions in if statements
+          if (MOD(ipos, 1)) STOP 3 ! { dg-warning "if it evaluates to nonzero" }
+
+          ! Test non logical expressions in if blocks
+          if (MOD(2 * ipos, 2)) then ! { dg-warning "if it evaluates to nonzero" }
+            STOP 4
+          endif
+        END
+diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
+new file mode 100644
+index 00000000000..35cb4c51b8d
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_3.f
+@@ -0,0 +1,25 @@
+! { dg-do compile }
+! { dg-options "-fdec -fno-dec-non-logical-if" }
+!
+! Allow logical expressions in if statements and blocks
+!
+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
+!             and Jeff Law <law@redhat.com>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        PROGRAM logical_exp_if_st_bl
+          INTEGER ipos/1/
+          INTEGER ineg/0/
+
+          ! Test non logical variables
+          if (ineg) STOP 1 ! { dg-error "IF clause at" }
+          if (0) STOP 2 ! { dg-error "IF clause at" }
+
+          ! Test non logical expressions in if statements
+          if (MOD(ipos, 1)) STOP 3 ! { dg-error "IF clause at" }
+
+          ! Test non logical expressions in if blocks
+          if (MOD(2 * ipos, 2)) then ! { dg-error "IF clause at" }
+            STOP 4
+          endif
+        END
+diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
+new file mode 100644
+index 00000000000..7b60b60827f
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_4.f
+@@ -0,0 +1,45 @@
+! { dg-do run }
+! { dg-options "-fdec -Wconversion-extra" }
+!
+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
+!             and Jeff Law <law@redhat.com>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+       function othersub1()
+        integer*4 othersub1
+        othersub1 = 9
+       end
+
+       function othersub2()
+        integer*4 othersub2
+        othersub2 = 0
+       end
+
+       program MAIN
+        integer*4 othersub1
+        integer*4 othersub2
+        integer a /1/
+        integer b /2/        
+ 
+        if (othersub1()) then ! { dg-warning "if it evaluates to nonzero" }
+           write(*,*) "OK"
+        else
+           stop 1
+        end if
+        if (othersub2()) then ! { dg-warning "if it evaluates to nonzero" }
+           stop 2
+        else
+           write(*,*) "OK"
+        end if
+        if (a-b) then ! { dg-warning "if it evaluates to nonzero" }
+           write(*,*) "OK"
+        else
+           stop 3
+        end if
+        if (b-(a+1)) then ! { dg-warning "if it evaluates to nonzero" }
+           stop 3
+        else
+           write(*,*) "OK"
+        end if
+       end
+
+diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
+new file mode 100644
+index 00000000000..80336f48ca1
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_5.f
+@@ -0,0 +1,45 @@
+! { dg-do run }
+! { dg-options "-fdec-non-logical-if -Wconversion-extra" }
+!
+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
+!             and Jeff Law <law@redhat.com>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+       function othersub1()
+        integer*4 othersub1
+        othersub1 = 9
+       end
+
+       function othersub2()
+        integer*4 othersub2
+        othersub2 = 0
+       end
+
+       program MAIN
+        integer*4 othersub1
+        integer*4 othersub2
+        integer a /1/
+        integer b /2/        
+ 
+        if (othersub1()) then ! { dg-warning "Non-LOGICAL type in IF statement" }
+           write(*,*) "OK"
+        else
+           stop 1
+        end if
+        if (othersub2()) then ! { dg-warning "Non-LOGICAL type in IF statement" }
+           stop 2
+        else
+           write(*,*) "OK"
+        end if
+        if (a-b) then ! { dg-warning "Non-LOGICAL type in IF statement" }
+           write(*,*) "OK"
+        else
+           stop 3
+        end if
+        if (b-(a+1)) then ! { dg-warning "Non-LOGICAL type in IF statement" }
+           stop 3
+        else
+           write(*,*) "OK"
+        end if
+       end
+
+diff --git a/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
+new file mode 100644
+index 00000000000..e1125ca717a
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_logical_expressions_if_statements_blocks_6.f
+@@ -0,0 +1,45 @@
+! { dg-do compile }
+! { dg-options "-fdec -fno-dec-non-logical-if" }
+!
+! Contributed by Francisco Redondo Marchena <francisco.marchema@codethink.co.uk>
+!             and Jeff Law <law@redhat.com>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+       function othersub1()
+        integer*4 othersub1
+        othersub1 = 9
+       end
+
+       function othersub2()
+        integer*4 othersub2
+        othersub2 = 0
+       end
+
+       program MAIN
+        integer*4 othersub1
+        integer*4 othersub2
+        integer a /1/
+        integer b /2/        
+ 
+        if (othersub1()) then ! { dg-error "IF clause at" }
+           write(*,*) "OK"
+        else
+           stop 1
+        end if
+        if (othersub2()) then ! { dg-error "IF clause at" }
+           stop 2
+        else
+           write(*,*) "OK"
+        end if
+        if (a-b) then ! { dg-error "IF clause at" }
+           write(*,*) "OK"
+        else
+           stop 3
+        end if
+        if (b-(a+1)) then ! { dg-error "IF clause at" }
+           stop 3
+        else
+           write(*,*) "OK"
+        end if
+       end
+
+-- 
+2.27.0
+
--- a/gcc12-fortran-fdec-override-kind.patch
+++ b/gcc12-fortran-fdec-override-kind.patch
@ -0,0 +1,588 @@
+From 786869fd62813e80da9b6545a295d53c36275c19 Mon Sep 17 00:00:00 2001
+From: Mark Eggleston <markeggleston@gcc.gnu.org>
+Date: Fri, 22 Jan 2021 13:12:14 +0000
+Subject: [PATCH 06/10] Allow string length and kind to be specified on a per
+ variable basis.
+
+This allows kind/length to be mixed with array specification in
+declarations.
+
+e.g.
+
+      INTEGER*4 x*2, y*8
+      CHARACTER names*20(10)
+      REAL v(100)*8, vv*4(50)
+
+The per-variable size overrides the kind or length specified for the type.
+
+Use -fdec-override-kind to enable. Also enabled by -fdec.
+
+Note: this feature is a merger of two previously separate features.
+
+Now accepts named constants as kind parameters:
+
+      INTEGER A
+      PARAMETER (A=2)
+      INTEGER B*(A)
+
+Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+
+Now rejects invalid kind parameters and prints error messages:
+
+      INTEGER X*3
+
+caused an internal compiler error.
+
+Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+---
+ gcc/fortran/decl.cc                           | 156 ++++++++++++++----
+ gcc/fortran/lang.opt                          |   4 +
+ gcc/fortran/options.cc                        |   1 +
+ .../dec_mixed_char_array_declaration_1.f      |  13 ++
+ .../dec_mixed_char_array_declaration_2.f      |  13 ++
+ .../dec_mixed_char_array_declaration_3.f      |  13 ++
+ .../gfortran.dg/dec_spec_in_variable_1.f      |  31 ++++
+ .../gfortran.dg/dec_spec_in_variable_2.f      |  31 ++++
+ .../gfortran.dg/dec_spec_in_variable_3.f      |  31 ++++
+ .../gfortran.dg/dec_spec_in_variable_4.f      |  14 ++
+ .../gfortran.dg/dec_spec_in_variable_5.f      |  19 +++
+ .../gfortran.dg/dec_spec_in_variable_6.f      |  19 +++
+ .../gfortran.dg/dec_spec_in_variable_7.f      |  15 ++
+ .../gfortran.dg/dec_spec_in_variable_8.f      |  14 ++
+ 14 files changed, 340 insertions(+), 34 deletions(-)
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
+ create mode 100644 gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
+
+diff --git a/gcc/fortran/decl.cc b/gcc/fortran/decl.cc
+index 5c8c1b7981b..f7dc9d8263d 100644
+--- a/gcc/fortran/decl.cc
+++ b/gcc/fortran/decl.cc
+@@ -1213,6 +1213,54 @@ syntax:
+   return MATCH_ERROR;
+ }
+ 
+/* This matches the nonstandard kind given after a variable name, like:
+   INTEGER x*2, y*4
+   The per-variable kind will override any kind given in the type
+   declaration.
+*/
+
+static match
+match_per_symbol_kind (int *length)
+{
+  match m;
+  gfc_expr *expr = NULL;
+
+  m = gfc_match_char ('*');
+  if (m != MATCH_YES)
+    return m;
+
+  m = gfc_match_small_literal_int (length, NULL);
+  if (m == MATCH_YES || m == MATCH_ERROR)
+    return m;
+
+  if (gfc_match_char ('(') == MATCH_NO)
+    return MATCH_ERROR;
+
+  m = gfc_match_expr (&expr);
+  if (m == MATCH_YES)
+    {
+      m = MATCH_ERROR; // Assume error
+      if (gfc_expr_check_typed (expr, gfc_current_ns, false))
+	{
+	  if ((expr->expr_type == EXPR_CONSTANT)
+	      && (expr->ts.type == BT_INTEGER))
+	    {
+	      *length = mpz_get_si(expr->value.integer);
+	      m = MATCH_YES;
+	    }
+	}
+
+	if (m == MATCH_YES)
+	  {
+	    if (gfc_match_char (')') == MATCH_NO)
+	       m = MATCH_ERROR;
+  }
+     }
+
+  if (expr != NULL)
+     gfc_free_expr (expr);
+  return m;
+}
+ 
+ /* Special subroutine for finding a symbol.  Check if the name is found
+    in the current name space.  If not, and we're compiling a function or
+@@ -2443,6 +2491,35 @@ check_function_name (char *name)
+ }
+ 
+ 
+static match
+match_character_length_clause (gfc_charlen **cl, bool *cl_deferred, int elem)
+{
+  gfc_expr* char_len;
+  char_len = NULL;
+
+  match m = match_char_length (&char_len, cl_deferred, false);
+  if (m == MATCH_YES)
+    {
+      *cl = gfc_new_charlen (gfc_current_ns, NULL);
+      (*cl)->length = char_len;
+    }
+  else if (m == MATCH_NO)
+    {
+      if (elem > 1
+	  && (current_ts.u.cl->length == NULL
+	      || current_ts.u.cl->length->expr_type != EXPR_CONSTANT))
+	{
+	  *cl = gfc_new_charlen (gfc_current_ns, NULL);
+	  (*cl)->length = gfc_copy_expr (current_ts.u.cl->length);
+	}
+      else
+      *cl = current_ts.u.cl;
+
+      *cl_deferred = current_ts.deferred;
+    }
+  return m;
+}
+
+ /* Match a variable name with an optional initializer.  When this
+    subroutine is called, a variable is expected to be parsed next.
+    Depending on what is happening at the moment, updates either the
+@@ -2453,7 +2530,7 @@ variable_decl (int elem)
+ {
+   char name[GFC_MAX_SYMBOL_LEN + 1];
+   static unsigned int fill_id = 0;
+-  gfc_expr *initializer, *char_len;
+  gfc_expr *initializer;
+   gfc_array_spec *as;
+   gfc_array_spec *cp_as; /* Extra copy for Cray Pointees.  */
+   gfc_charlen *cl;
+@@ -2462,11 +2539,15 @@ variable_decl (int elem)
+   match m;
+   bool t;
+   gfc_symbol *sym;
+  match cl_match;
+  match kind_match;
+  int overridden_kind;
+   char c;
+ 
+   initializer = NULL;
+   as = NULL;
+   cp_as = NULL;
+  kind_match = MATCH_NO;
+ 
+   /* When we get here, we've just matched a list of attributes and
+      maybe a type and a double colon.  The next thing we expect to see
+@@ -2519,6 +2600,28 @@ variable_decl (int elem)
+ 
+   var_locus = gfc_current_locus;
+ 
+
+  cl = NULL;
+  cl_deferred = false;
+  cl_match = MATCH_NO;
+
+  /* Check for a character length clause before an array clause */
+  if (flag_dec_override_kind)
+    {
+      if (current_ts.type == BT_CHARACTER)
+	{
+	  cl_match = match_character_length_clause (&cl, &cl_deferred, elem);
+	  if (cl_match == MATCH_ERROR)
+	    goto cleanup;
+	}
+      else
+	{
+	  kind_match = match_per_symbol_kind (&overridden_kind);
+	  if (kind_match == MATCH_ERROR)
+	    goto cleanup;
+	}
+    }
+
+   /* Now we could see the optional array spec. or character length.  */
+   m = gfc_match_array_spec (&as, true, true);
+   if (m == MATCH_ERROR)
+@@ -2667,40 +2770,12 @@ variable_decl (int elem)
+ 	}
+     }
+ 
+-  char_len = NULL;
+-  cl = NULL;
+-  cl_deferred = false;
+-
+-  if (current_ts.type == BT_CHARACTER)
+  /* Second chance for a character length clause */
+  if (cl_match == MATCH_NO && current_ts.type == BT_CHARACTER)
+     {
+-      switch (match_char_length (&char_len, &cl_deferred, false))
+-	{
+-	case MATCH_YES:
+-	  cl = gfc_new_charlen (gfc_current_ns, NULL);
+-
+-	  cl->length = char_len;
+-	  break;
+-
+-	/* Non-constant lengths need to be copied after the first
+-	   element.  Also copy assumed lengths.  */
+-	case MATCH_NO:
+-	  if (elem > 1
+-	      && (current_ts.u.cl->length == NULL
+-		  || current_ts.u.cl->length->expr_type != EXPR_CONSTANT))
+-	    {
+-	      cl = gfc_new_charlen (gfc_current_ns, NULL);
+-	      cl->length = gfc_copy_expr (current_ts.u.cl->length);
+-	    }
+-	  else
+-	    cl = current_ts.u.cl;
+-
+-	  cl_deferred = current_ts.deferred;
+-
+-	  break;
+-
+-	case MATCH_ERROR:
+-	  goto cleanup;
+-	}
+      m = match_character_length_clause (&cl, &cl_deferred, elem);
+      if (m == MATCH_ERROR)
+	goto cleanup;
+     }
+ 
+   /* The dummy arguments and result of the abreviated form of MODULE
+@@ -2802,6 +2877,19 @@ variable_decl (int elem)
+       goto cleanup;
+     }
+ 
+  if (kind_match == MATCH_YES)
+    {
+      gfc_find_symbol (name, gfc_current_ns, 1, &sym);
+      /* sym *must* be found at this point */
+      sym->ts.kind = overridden_kind;
+      if (gfc_validate_kind (sym->ts.type, sym->ts.kind, true) < 0)
+	{
+	  gfc_error ("Kind %d not supported for type %s at %C",
+		     sym->ts.kind, gfc_basic_typename (sym->ts.type));
+	  return MATCH_ERROR;
+	}
+    }
+
+   if (!check_function_name (name))
+     {
+       m = MATCH_ERROR;
+diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
+index 25cc948699b..4a269ebb22d 100644
+--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
+@@ -502,6 +502,10 @@ fdec-math
+ Fortran Var(flag_dec_math)
+ Enable legacy math intrinsics for compatibility.
+ 
+fdec-override-kind
+Fortran Var(flag_dec_override_kind)
+Enable support for per variable kind specification.
+
+ fdec-structure
+ Fortran Var(flag_dec_structure)
+ Enable support for DEC STRUCTURE/RECORD.
+diff --git a/gcc/fortran/options.cc b/gcc/fortran/options.cc
+index d6bd36c3a8a..edbab483b36 100644
+--- a/gcc/fortran/options.cc
+++ b/gcc/fortran/options.cc
+@@ -78,6 +78,7 @@ set_dec_flags (int value)
+   SET_BITFLAG (flag_dec_blank_format_item, value, value);
+   SET_BITFLAG (flag_dec_char_conversions, value, value);
+   SET_BITFLAG (flag_dec_duplicates, value, value);
+  SET_BITFLAG (flag_dec_override_kind, value, value);
+ }
+ 
+ /* Finalize DEC flags.  */
+diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
+new file mode 100644
+index 00000000000..706ea4112a4
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_1.f
+@@ -0,0 +1,13 @@
+! { dg-do run }
+! { dg-options "-fdec" }
+!
+! Test character declaration with mixed string length and array specification
+!
+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+       PROGRAM character_declaration
+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/
+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1
+        END
+diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
+new file mode 100644
+index 00000000000..26d2acf01de
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_2.f
+@@ -0,0 +1,13 @@
+! { dg-do run }
+! { dg-options "-fdec-override-kind" }
+!
+! Test character declaration with mixed string length and array specification
+!
+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        PROGRAM character_declaration
+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/
+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1
+        END
+diff --git a/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
+new file mode 100644
+index 00000000000..76e4f0bdb93
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_mixed_char_array_declaration_3.f
+@@ -0,0 +1,13 @@
+! { dg-do compile }
+! { dg-options "-fdec-override-kind -fno-dec-override-kind" }
+!
+! Test character declaration with mixed string length and array specification
+!
+! Contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
+! Modified by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        PROGRAM character_declaration
+          CHARACTER ASPEC_SLENGTH*2 (5) /'01','02','03','04','05'/ ! { dg-error "Syntax error" }
+          CHARACTER SLENGTH_ASPEC(5)*2 /'01','02','03','04','05'/
+          if (ASPEC_SLENGTH(3).NE.SLENGTH_ASPEC(3)) STOP 1 ! { dg-error " Operands of comparison operator" }
+        END
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
+new file mode 100644
+index 00000000000..edd0f5874b7
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_1.f
+@@ -0,0 +1,31 @@
+! { dg-do run }
+! { dg-options "-fdec" }
+!
+! Test kind specification in variable not in type
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer*8  ai*1, bi*4, ci
+          real*4 ar*4, br*8, cr
+
+          ai = 1
+          ar = 1.0
+          bi = 2
+          br = 2.0
+          ci = 3
+          cr = 3.0
+
+          if (ai .ne. 1) stop 1
+          if (abs(ar - 1.0) > 1.0D-6) stop 2
+          if (bi .ne. 2) stop 3
+          if (abs(br - 2.0) > 1.0D-6) stop 4
+          if (ci .ne. 3) stop 5
+          if (abs(cr - 3.0) > 1.0D-6) stop 6
+          if (kind(ai) .ne. 1) stop 7
+          if (kind(ar) .ne. 4) stop 8
+          if (kind(bi) .ne. 4) stop 9
+          if (kind(br) .ne. 8) stop 10
+          if (kind(ci) .ne. 8) stop 11
+          if (kind(cr) .ne. 4) stop 12
+        end
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
+new file mode 100644
+index 00000000000..bfaba584dbb
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_2.f
+@@ -0,0 +1,31 @@
+! { dg-do run }
+! { dg-options "-fdec-override-kind" }
+!
+! Test kind specification in variable not in type
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer*8  ai*1, bi*4, ci
+          real*4 ar*4, br*8, cr
+
+          ai = 1
+          ar = 1.0
+          bi = 2
+          br = 2.0
+          ci = 3
+          cr = 3.0
+
+          if (ai .ne. 1) stop 1
+          if (abs(ar - 1.0) > 1.0D-6) stop 2
+          if (bi .ne. 2) stop 3
+          if (abs(br - 2.0) > 1.0D-6) stop 4
+          if (ci .ne. 3) stop 5
+          if (abs(cr - 3.0) > 1.0D-6) stop 6
+          if (kind(ai) .ne. 1) stop 7
+          if (kind(ar) .ne. 4) stop 8
+          if (kind(bi) .ne. 4) stop 9
+          if (kind(br) .ne. 8) stop 10
+          if (kind(ci) .ne. 8) stop 11
+          if (kind(cr) .ne. 4) stop 12
+        end
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
+new file mode 100644
+index 00000000000..5ff434e7466
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_3.f
+@@ -0,0 +1,31 @@
+! { dg-do compile }
+! { dg-options "-fdec -fno-dec-override-kind" }
+!
+! Test kind specification in variable not in type
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer*8  ai*1, bi*4, ci ! { dg-error "Syntax error" }
+          real*4 ar*4, br*8, cr ! { dg-error "Syntax error" }
+
+          ai = 1
+          ar = 1.0
+          bi = 2
+          br = 2.0
+          ci = 3
+          cr = 3.0
+
+          if (ai .ne. 1) stop 1
+          if (abs(ar - 1.0) > 1.0D-6) stop 2
+          if (bi .ne. 2) stop 3
+          if (abs(br - 2.0) > 1.0D-6) stop 4
+          if (ci .ne. 3) stop 5
+          if (abs(cr - 3.0) > 1.0D-6) stop 6
+          if (kind(ai) .ne. 1) stop 7
+          if (kind(ar) .ne. 4) stop 8
+          if (kind(bi) .ne. 4) stop 9
+          if (kind(br) .ne. 8) stop 10
+          if (kind(ci) .ne. 8) stop 11
+          if (kind(cr) .ne. 4) stop 12
+        end
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
+new file mode 100644
+index 00000000000..c01980e8b9d
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_4.f
+@@ -0,0 +1,14 @@
+! { dg-do compile }
+!
+! Test kind specification in variable not in type. The per variable
+! kind specification is not enabled so these should fail
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer a
+          parameter(a=2)
+          integer b*(a) ! { dg-error "Syntax error" }
+          real c*(8)    ! { dg-error "Syntax error" }
+          logical d*1_1 ! { dg-error "Syntax error" }
+        end
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
+new file mode 100644
+index 00000000000..e2f39da3f4f
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_5.f
+@@ -0,0 +1,19 @@
+! { dg-do run }
+! { dg-options "-fdec-override-kind" }
+!
+! Test kind specification in variable not in type
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer a
+          parameter(a=2)
+          integer b*(a)
+          real c*(8)
+          logical d*(1_1)
+          character e*(a)
+          if (kind(b).ne.2) stop 1
+          if (kind(c).ne.8) stop 2
+          if (kind(d).ne.1) stop 3
+          if (len(e).ne.2) stop 4
+        end
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
+new file mode 100644
+index 00000000000..569747874e3
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_6.f
+@@ -0,0 +1,19 @@
+! { dg-do run }
+! { dg-options "-fdec" }
+!
+! Test kind specification in variable not in type
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer a
+          parameter(a=2)
+          integer b*(a)
+          real c*(8)
+          logical d*(1_1)
+          character e*(a)
+          if (kind(b).ne.2) stop 1
+          if (kind(c).ne.8) stop 2
+          if (kind(d).ne.1) stop 3
+          if (len(e).ne.2) stop 4
+        end
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
+new file mode 100644
+index 00000000000..b975bfd15c5
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_7.f
+@@ -0,0 +1,15 @@
+! { dg-do compile }
+! { dg-options "-fdec -fno-dec-override-kind" }
+!
+! Test kind specification in variable not in type as the per variable
+! kind specification is not enables these should fail
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer a
+          parameter(a=2)
+          integer b*(a) ! { dg-error "Syntax error" }
+          real c*(8)    ! { dg-error "Syntax error" }
+          logical d*1_1 ! { dg-error "Syntax error" }
+        end
+diff --git a/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
+new file mode 100644
+index 00000000000..85732e0bd85
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dec_spec_in_variable_8.f
+@@ -0,0 +1,14 @@
+! { dg-do compile }
+! { dg-options "-fdec" }
+!
+! Check that invalid kind values are rejected.
+!
+! Contributed by Mark Eggleston <mark.eggleston@codethink.com>
+!
+        program spec_in_var
+          integer a
+          parameter(a=3)
+          integer b*(a) ! { dg-error "Kind 3 not supported" }
+          real c*(78)   ! { dg-error "Kind 78 not supported" }
+          logical d*(*) ! { dg-error "Invalid character" }
+        end
+-- 
+2.27.0
+
--- a/gcc12-fortran-flogical-as-integer.patch
+++ b/gcc12-fortran-flogical-as-integer.patch
@ -0,0 +1,305 @@
+From 9b45f3063dfd2b893e7963a4828c1b0afecdc68a Mon Sep 17 00:00:00 2001
+From: Mark Eggleston <markeggleston@gcc.gnu.org>
+Date: Fri, 22 Jan 2021 12:41:46 +0000
+Subject: [PATCH 02/10] Convert LOGICAL to INTEGER for arithmetic ops, and vice
+ versa
+
+We allow converting LOGICAL types to INTEGER when doing arithmetic
+operations, and converting INTEGER types to LOGICAL for use in
+boolean operations.
+
+This feature is enabled with the -flogical-as-integer flag.
+
+Note: using this feature will disable bitwise logical operations enabled by
+-fdec.
+---
+ gcc/fortran/lang.opt                          |  4 ++
+ gcc/fortran/resolve.cc                        | 55 ++++++++++++++++++-
+ .../logical_to_integer_and_vice_versa_1.f     | 31 +++++++++++
+ .../logical_to_integer_and_vice_versa_2.f     | 31 +++++++++++
+ .../logical_to_integer_and_vice_versa_3.f     | 33 +++++++++++
+ .../logical_to_integer_and_vice_versa_4.f     | 33 +++++++++++
+ 6 files changed, 186 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
+ create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
+ create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
+ create mode 100644 gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
+
+diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
+index 52bd522051e..c4da248f07c 100644
+--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
+@@ -497,6 +497,10 @@ fdec-static
+ Fortran Var(flag_dec_static)
+ Enable DEC-style STATIC and AUTOMATIC attributes.
+ 
+flogical-as-integer
+Fortran Var(flag_logical_as_integer)
+Convert from integer to logical or logical to integer for arithmetic operations.
+
+ fdefault-double-8
+ Fortran Var(flag_default_double)
+ Set the default double precision kind to an 8 byte wide type.
+diff --git a/gcc/fortran/resolve.cc b/gcc/fortran/resolve.cc
+index c075d0fa0c4..4b90cb59902 100644
+--- a/gcc/fortran/resolve.cc
+++ b/gcc/fortran/resolve.cc
+@@ -3915,7 +3915,6 @@ lookup_uop_fuzzy (const char *op, gfc_symtree *uop)
+   return gfc_closest_fuzzy_match (op, candidates);
+ }
+ 
+-
+ /* Callback finding an impure function as an operand to an .and. or
+    .or.  expression.  Remember the last function warned about to
+    avoid double warnings when recursing.  */
+@@ -3975,6 +3974,22 @@ convert_hollerith_to_character (gfc_expr *e)
+     }
+ }
+ 
+/* If E is a logical, convert it to an integer and issue a warning
+   for the conversion.  */
+
+static void
+convert_integer_to_logical (gfc_expr *e)
+{
+  if (e->ts.type == BT_INTEGER)
+    {
+      /* Convert to LOGICAL */
+      gfc_typespec t;
+      t.type = BT_LOGICAL;
+      t.kind = 1;
+      gfc_convert_type_warn (e, &t, 2, 1);
+    }
+}
+
+ /* Convert to numeric and issue a warning for the conversion.  */
+ 
+ static void
+@@ -3987,6 +4002,22 @@ convert_to_numeric (gfc_expr *a, gfc_expr *b)
+   gfc_convert_type_warn (a, &t, 2, 1);
+ }
+ 
+/* If E is a logical, convert it to an integer and issue a warning
+   for the conversion.  */
+
+static void
+convert_logical_to_integer (gfc_expr *e)
+{
+  if (e->ts.type == BT_LOGICAL)
+    {
+      /* Convert to INTEGER */
+      gfc_typespec t;
+      t.type = BT_INTEGER;
+      t.kind = 1;
+      gfc_convert_type_warn (e, &t, 2, 1);
+    }
+}
+
+ /* Resolve an operator expression node.  This can involve replacing the
+    operation with a user defined function call.  */
+ 
+@@ -4072,6 +4103,12 @@ resolve_operator (gfc_expr *e)
+     case INTRINSIC_TIMES:
+     case INTRINSIC_DIVIDE:
+     case INTRINSIC_POWER:
+      if (flag_logical_as_integer)
+	{
+	  convert_logical_to_integer (op1);
+	  convert_logical_to_integer (op2);
+	}
+
+       if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts))
+ 	{
+ 	  gfc_type_convert_binary (e, 1);
+@@ -4108,6 +4145,13 @@ resolve_operator (gfc_expr *e)
+     case INTRINSIC_OR:
+     case INTRINSIC_EQV:
+     case INTRINSIC_NEQV:
+
+      if (flag_logical_as_integer)
+	{
+	  convert_integer_to_logical (op1);
+	  convert_integer_to_logical (op2);
+	}
+
+       if (op1->ts.type == BT_LOGICAL && op2->ts.type == BT_LOGICAL)
+ 	{
+ 	  e->ts.type = BT_LOGICAL;
+@@ -4158,6 +4202,9 @@ resolve_operator (gfc_expr *e)
+ 	  goto simplify_op;
+ 	}
+ 
+      if (flag_logical_as_integer)
+	convert_integer_to_logical (op1);
+
+       if (op1->ts.type == BT_LOGICAL)
+ 	{
+ 	  e->ts.type = BT_LOGICAL;
+@@ -4198,6 +4245,12 @@ resolve_operator (gfc_expr *e)
+ 	  convert_hollerith_to_character (op2);
+ 	}
+ 
+      if (flag_logical_as_integer)
+	{
+	  convert_logical_to_integer (op1);
+	  convert_logical_to_integer (op2);
+	}
+
+       if (op1->ts.type == BT_CHARACTER && op2->ts.type == BT_CHARACTER
+ 	  && op1->ts.kind == op2->ts.kind)
+ 	{
+diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
+new file mode 100644
+index 00000000000..938a91d9e9a
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_1.f
+@@ -0,0 +1,31 @@
+! { dg-do run }
+! { dg-options "-std=legacy -flogical-as-integer" }
+!
+! Test conversion between logical and integer for logical operators
+!
+! Test case contributed by Jim MacArthur <jim.macarthur@codethink.co.uk>
+! Modified for -flogical-as-integer by Mark Eggleston
+! <mark.eggleston@codethink.com>
+!
+        PROGRAM logical_integer_conversion
+          LOGICAL lpos /.true./
+          INTEGER ineg/0/
+          INTEGER ires
+          LOGICAL lres
+
+          ! Test Logicals converted to Integers
+          if ((lpos.AND.ineg).EQ.1) STOP 3
+          if ((ineg.AND.lpos).NE.0) STOP 4
+          ires = (.true..AND.0)
+          if (ires.NE.0) STOP 5
+          ires = (1.AND..false.)
+          if (ires.EQ.1) STOP 6
+
+          ! Test Integers converted to Logicals
+          if (lpos.EQ.ineg) STOP 7
+          if (ineg.EQ.lpos) STOP 8
+          lres = (.true..EQ.0)
+          if (lres) STOP 9
+          lres = (1.EQ..false.)
+          if (lres) STOP 10
+        END
+diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
+new file mode 100644
+index 00000000000..9f146202ba5
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_2.f
+@@ -0,0 +1,31 @@
+! { dg-do compile }
+! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" }
+!
+! Based on logical_to_integer_and_vice_versa_1.f but with option disabled
+! to test for error messages.
+!
+! Test case contributed by by Mark Eggleston <mark.eggleston@codethink.com>
+!
+!
+        PROGRAM logical_integer_conversion
+          LOGICAL lpos /.true./
+          INTEGER ineg/0/
+          INTEGER ires
+          LOGICAL lres
+
+          ! Test Logicals converted to Integers
+          if ((lpos.AND.ineg).EQ.1) STOP 3 ! { dg-error "Operands of logical operator" }
+          if ((ineg.AND.lpos).NE.0) STOP 4 ! { dg-error "Operands of logical operator" }
+          ires = (.true..AND.0) ! { dg-error "Operands of logical operator" }
+          if (ires.NE.0) STOP 5
+          ires = (1.AND..false.) ! { dg-error "Operands of logical operator" }
+          if (ires.EQ.1) STOP 6
+
+          ! Test Integers converted to Logicals
+          if (lpos.EQ.ineg) STOP 7 ! { dg-error "Operands of comparison operator" }
+          if (ineg.EQ.lpos) STOP 8 ! { dg-error "Operands of comparison operator" }
+          lres = (.true..EQ.0) ! { dg-error "Operands of comparison operator" }
+          if (lres) STOP 9
+          lres = (1.EQ..false.) ! { dg-error "Operands of comparison operator" }
+          if (lres) STOP 10
+        END
+diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
+new file mode 100644
+index 00000000000..446873eb2dc
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_3.f
+@@ -0,0 +1,33 @@
+! { dg-do compile }
+! { dg-options "-std=legacy -flogical-as-integer" }
+!
+! Test conversion between logical and integer for logical operators
+!
+        program test
+          logical f /.false./
+          logical t /.true./
+          real x
+
+          x = 7.7
+          x = x + t*3.0
+          if (abs(x - 10.7).gt.0.00001) stop 1
+          x = x + .false.*5.0
+          if (abs(x - 10.7).gt.0.00001) stop 2
+          x = x - .true.*5.0
+          if (abs(x - 5.7).gt.0.00001) stop 3
+          x = x + t
+          if (abs(x - 6.7).gt.0.00001) stop 4
+          x = x + f
+          if (abs(x - 6.7).gt.0.00001) stop 5
+          x = x - t
+          if (abs(x - 5.7).gt.0.00001) stop 6
+          x = x - f
+          if (abs(x - 5.7).gt.0.00001) stop 7
+          x = x**.true.
+          if (abs(x - 5.7).gt.0.00001) stop 8
+          x = x**.false.
+          if (abs(x - 1.0).gt.0.00001) stop 9
+          x = x/t
+          if (abs(x - 1.0).gt.0.00001) stop 10
+          if ((x/.false.).le.huge(x)) stop 11
+        end
+diff --git a/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
+new file mode 100644
+index 00000000000..4301a4988d8
+--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/logical_to_integer_and_vice_versa_4.f
+@@ -0,0 +1,33 @@
+! { dg-do compile }
+! { dg-options "-std=legacy -flogical-as-integer -fno-logical-as-integer" }
+!
+! Test conversion between logical and integer for logical operators
+!
+        program test
+          logical f /.false./
+          logical t /.true./
+          real x
+
+          x = 7.7
+          x = x + t*3.0 ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 10.7).gt.0.00001) stop 1
+          x = x + .false.*5.0 ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 10.7).gt.0.00001) stop 2
+          x = x - .true.*5.0 ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 5.7).gt.0.00001) stop 3
+          x = x + t ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 6.7).gt.0.00001) stop 4
+          x = x + f ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 6.7).gt.0.00001) stop 5
+          x = x - t ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 5.7).gt.0.00001) stop 6
+          x = x - f ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 5.7).gt.0.00001) stop 7
+          x = x**.true. ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 5.7).gt.0.00001) stop 8
+          x = x**.false. ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 1.0).gt.0.00001) stop 9
+          x = x/t ! { dg-error "Operands of binary numeric" }
+          if (abs(x - 1.0).gt.0.00001) stop 10
+          if ((x/.false.).le.huge(x)) stop 11 ! { dg-error "Operands of binary numeric" }
+        end
+-- 
+2.27.0
+
--- a/gcc12-hack.patch
+++ b/gcc12-hack.patch
@ -64,119 +64,63 @@
 +				infodir="$(infodir)" \
 				GOCFLAGS="$(GOCFLAGS) $${flags}" \
 				GDCFLAGS="$(GDCFLAGS) $${flags}" \
- 				A68FLAGS="$(A68FLAGS) $${flags}" \
+ 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
 --- libcpp/macro.cc.jj	2019-01-09 13:01:21.420552123 +0100
-+++ libcpp/macro.cc	2024-11-30 13:16:41.163056391 +0100
-@@ -3680,8 +3680,6 @@ static cpp_macro *
+++ libcpp/macro.cc	2019-01-11 18:18:17.736876285 +0100
+@@ -3256,8 +3256,6 @@ static cpp_macro *
 create_iso_definition (cpp_reader *pfile)
 {
   bool following_paste_op = false;
 -  const char *paste_op_error_msg =
-    N_("%<##%> cannot appear at either end of a macro expansion");
+-    N_("'##' cannot appear at either end of a macro expansion");
   unsigned int num_extra_tokens = 0;
   unsigned nparms = 0;
   cpp_hashnode **params = NULL;
-@@ -3809,7 +3807,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3382,7 +3380,9 @@ create_iso_definition (cpp_reader *pfile
 	     function-like macros, but not at the end.  */
 	  if (following_paste_op)
 	    {
 -	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
 +	      cpp_error (pfile, CPP_DL_ERROR,
-+			 "%<##%> cannot appear at either end of a macro "
+			 "'##' cannot appear at either end of a macro "
 +			 "expansion");
 	      goto out;
 	    }
 	  if (!vaopt_tracker.completed ())
-@@ -3824,7 +3824,9 @@ create_iso_definition (cpp_reader *pfile
+@@ -3397,7 +3397,9 @@ create_iso_definition (cpp_reader *pfile
 	     function-like macros, but not at the beginning.  */
 	  if (macro->count == 1)
 	    {
 -	      cpp_error (pfile, CPP_DL_ERROR, paste_op_error_msg);
 +	      cpp_error (pfile, CPP_DL_ERROR,
-+			 "%<##%> cannot appear at either end of a macro "
+			 "'##' cannot appear at either end of a macro "
 +			 "expansion");
 	      goto out;
 	    }
 
 --- libcpp/expr.cc.jj	2019-01-09 13:01:22.415535734 +0100
-+++ libcpp/expr.cc	2024-11-30 13:14:52.468583689 +0100
-@@ -874,50 +874,54 @@ cpp_classify_number (cpp_reader *pfile,
+++ libcpp/expr.cc	2019-01-11 18:16:23.444726882 +0100
+@@ -803,16 +803,17 @@ cpp_classify_number (cpp_reader *pfile,
       if ((result & CPP_N_WIDTH) == CPP_N_LARGE
 	  && CPP_OPTION (pfile, cpp_warn_long_long))
         {
-          const char *message = CPP_OPTION (pfile, cplusplus)
+-          const char *message = CPP_OPTION (pfile, cplusplus) 
 -				? N_("use of C++11 long long integer constant")
 -		                : N_("use of C99 long long integer constant");
 -
 	  if (CPP_OPTION (pfile, c99))
-            cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location,
+             cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location,
 -				   0, message);
-+            cpp_warning_with_line (pfile, CPP_W_LONG_LONG, virtual_location, 0,
-+				   CPP_OPTION (pfile, cplusplus)
-+				   ? N_("use of C++11 long long integer "
-+					"constant")
-+				   : N_("use of C99 long long integer "
-+					"constant"));
+				   0, CPP_OPTION (pfile, cplusplus)
+				      ? N_("use of C++11 long long integer constant")
+				      : N_("use of C99 long long integer constant"));
           else
             cpp_pedwarning_with_line (pfile, CPP_W_LONG_LONG,
 -				      virtual_location, 0, message);
 +				      virtual_location, 0,
 +				      CPP_OPTION (pfile, cplusplus)
-+				      ? N_("use of C++11 long long integer "
-+					   "constant")
-+				      : N_("use of C99 long long integer "
-+					   "constant"));
+				      ? N_("use of C++11 long long integer constant")
+				      : N_("use of C99 long long integer constant"));
         }
 
       if ((result & CPP_N_SIZE_T) == CPP_N_SIZE_T
- 	  && !CPP_OPTION (pfile, size_t_literals))
-       {
-	  const char *message
-	    = (result & CPP_N_UNSIGNED) == CPP_N_UNSIGNED
-	      ? N_("use of C++23 %<size_t%> integer constant")
-	      : N_("use of C++23 %<make_signed_t<size_t>%> integer constant");
-	  cpp_warning_with_line (pfile, CPP_W_SIZE_T_LITERALS,
-				 virtual_location, 0, message);
-       }
-+	cpp_warning_with_line (pfile, CPP_W_SIZE_T_LITERALS,
-+			       virtual_location, 0,
-+			       (result & CPP_N_UNSIGNED) == CPP_N_UNSIGNED
-+				? N_("use of C++23 %<size_t%> integer "
-+				     "constant")
-+				: N_("use of C++23 %<make_signed_t<size_t>%> "
-+				     "integer constant"));
- 
-       if ((result & CPP_N_BITINT) != 0
- 	  && CPP_OPTION (pfile, cpp_warn_c11_c23_compat) != 0)
- 	{
- 	  if (CPP_OPTION (pfile, cpp_warn_c11_c23_compat) > 0)
- 	    {
-	      const char *message = N_("ISO C does not support literal "
-				       "%<wb%> suffixes before C23");
- 	      if (CPP_PEDANTIC (pfile) && !CPP_OPTION (pfile, true_false))
- 		cpp_pedwarning_with_line (pfile, CPP_W_C11_C23_COMPAT,
-					  virtual_location, 0, message);
-+					  virtual_location, 0,
-+					  "ISO C does not support literal "
-+					  "%<wb%> suffixes before C23");
- 	      else
- 		cpp_warning_with_line (pfile, CPP_W_C11_C23_COMPAT,
-				       virtual_location, 0, message);
-	    }
-	  else if (!CPP_OPTION (pfile, true_false))
-	    {
-	      const char *message = N_("ISO C does not support literal "
-+				       virtual_location, 0,
-+				       "ISO C does not support literal "
- 				       "%<wb%> suffixes before C23");
-	      cpp_pedwarning_with_line (pfile, CPP_W_PEDANTIC,
-					virtual_location, 0, message);
- 	    }
-+	  else if (!CPP_OPTION (pfile, true_false))
-+	    cpp_pedwarning_with_line (pfile, CPP_W_PEDANTIC,
-+				      virtual_location, 0,
-+				      "ISO C does not support literal "
-+				      "%<wb%> suffixes before C23");
- 	}
- 
-       result |= CPP_N_INTEGER;
--- a/gcc12-isl-dl.patch
+++ b/gcc12-isl-dl.patch
@ -629,7 +629,7 @@
 --- gcc/graphite.cc.jj	2015-11-04 14:15:32.000000000 +0100
 +++ gcc/graphite.cc	2015-11-04 14:56:02.645536409 +0100
@@ -60,6 +60,35 @@ along with GCC; see the file COPYING3.
- #include "tree-ssa-propagate.h"
+ #include "tree-into-ssa.h"
 #include "graphite.h"
 
 +__typeof (isl_pointers__) isl_pointers__;
@ -664,7 +664,7 @@
 /* Print global statistics to FILE.  */
 
 static void
-@@ -424,6 +453,15 @@ graphite_transform_loops (void)
+@@ -365,6 +394,15 @@ graphite_transform_loops (void)
   if (parallelized_function_p (cfun->decl))
     return;
 
@ -680,7 +680,7 @@
   calculate_dominance_info (CDI_DOMINATORS);
 
   /* We rely on post-dominators during merging of SESE regions so those
-@@ -519,6 +557,14 @@ graphite_transform_loops (void)
+@@ -455,6 +493,14 @@ graphite_transform_loops (void)
     }
 }
 
@ -696,16 +696,16 @@
 
 static void
 --- gcc/toplev.cc.jj	2017-02-19 13:02:31.000000000 +0100
-+++ gcc/toplev.cc	2024-11-30 13:22:34.175096117 +0100
-@@ -100,6 +100,7 @@ along with GCC; see the file COPYING3.
+++ gcc/toplev.cc	2017-02-19 16:50:25.536301350 +0100
+@@ -94,6 +94,7 @@ along with GCC; see the file COPYING3.
 
 #ifdef HAVE_isl
 #include <isl/version.h>
 +extern const char *get_isl_version (bool);
 #endif
 
- static void general_init (const char *, bool, unique_argv original_argv);
-@@ -652,7 +653,7 @@ print_version (FILE *file, const char *i
+ static void general_init (const char *, bool);
+@@ -683,7 +684,7 @@ print_version (FILE *file, const char *i
 #ifndef HAVE_isl
 	   "none"
 #else
--- a/gcc12-isl-dl2.patch
+++ b/gcc12-isl-dl2.patch
@ -6,8 +6,8 @@
 	directory.

 --- gcc/toplev.cc.jj	2008-12-09 23:59:10.000000000 +0100
-+++ gcc/toplev.cc	2024-11-30 13:26:05.085132543 +0100
-@@ -112,6 +112,8 @@ static void finalize ();
+++ gcc/toplev.cc	2009-01-27 14:33:52.000000000 +0100
+@@ -113,6 +113,8 @@ static void finalize (bool);
 static void crash_signal (int) ATTRIBUTE_NORETURN;
 static void compile_file (void);
 
@ -16,14 +16,14 @@
 /* Decoded options, and number of such options.  */
 struct cl_decoded_option *save_decoded_options;
 unsigned int save_decoded_options_count;
-@@ -2296,6 +2298,8 @@ toplev::main (int argc, char **argv)
+@@ -2239,6 +2241,8 @@ toplev::main (int argc, char **argv)
 
   expandargv (&argc, &argv);
 
 +  toplev_main_argv = CONST_CAST2 (const char **, char **, argv);
 +
   /* Initialization of GCC's environment, and diagnostics.  */
-   general_init (argv[0], m_init_signals, std::move (original_argv));
+   general_init (argv[0], m_init_signals);
 
 --- gcc/graphite.cc.jj	2010-12-01 10:24:32.000000000 -0500
 +++ gcc/graphite.cc	2010-12-01 11:46:07.832118193 -0500
--- a/gcc12-libgomp-omp_h-multilib.patch
+++ b/gcc12-libgomp-omp_h-multilib.patch
--- a/gcc12-libstdc++-docs.patch
+++ b/gcc12-libstdc++-docs.patch
@ -4,21 +4,21 @@
       <a class="link" href="https://www.fsf.org" target="_top">FSF
       </a>
     </p><p>
-+      Release 16.0.1
+      Release 12.3.1
 +    </p><p>
       Permission is granted to copy, distribute and/or modify this
       document under the terms of the GNU Free Documentation
       License, Version 1.2 or any later version published by the
 --- libstdc++-v3/doc/html/api.html.jj	2011-01-03 12:53:21.000000000 +0100
-+++ libstdc++-v3/doc/html/api.html	2024-11-30 13:30:16.607594623 +0100
+++ libstdc++-v3/doc/html/api.html	2011-01-04 18:12:01.672757784 +0100
@@ -20,7 +20,9 @@
   member functions for the library classes, finding out what is in a
   particular include file, looking at inheritance diagrams, etc.
 </p><p>
 -  The API documentation, rendered into HTML, can be viewed online
 +  The API documentation, rendered into HTML, can be viewed locally
-+  <a class="link" href="api/index.html" target="_top">for the 16.0.1 release</a>,
+  <a class="link" href="api/index.html" target="_top">for the 12.3.1 release</a>,
 +  online
-   <a class="link" href="https://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
+   <a class="link" href="http://gcc.gnu.org/onlinedocs/" target="_top">for each GCC release</a>
   and
-   <a class="link" href="https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/index.html" target="_top">
+   <a class="link" href="http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/index.html" target="_top">
--- a/gcc12-libtool-no-rpath.patch
+++ b/gcc12-libtool-no-rpath.patch
@ -5,7 +5,7 @@ libtool sucks.
 	  rpath="$finalize_rpath"
 	  test "$mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
-+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac
+	    case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
 		if test -z "$hardcode_libdirs"; then
@ -13,7 +13,7 @@ libtool sucks.
       rpath=
       hardcode_libdirs=
       for libdir in $compile_rpath $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac
+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
@ -21,7 +21,7 @@ libtool sucks.
       rpath=
       hardcode_libdirs=
       for libdir in $finalize_rpath; do
-+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64|/usr/lib/../lib64/lp64d) continue;; esac
+	case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac
 	if test -n "$hardcode_libdir_flag_spec"; then
 	  if test -n "$hardcode_libdir_separator"; then
 	    if test -z "$hardcode_libdirs"; then
--- a/gcc12-no-add-needed.patch
+++ b/gcc12-no-add-needed.patch
@ -34,4 +34,4 @@
 +#define LINK_EH_SPEC "--no-add-needed %{!static|static-pie:--eh-frame-hdr} "
 #endif
 
- 
+ #define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
--- a/gcc12-rh1574936.patch
+++ b/gcc12-rh1574936.patch
@ -0,0 +1,30 @@
+crt files and statically linked libgcc objects cause false positives
+in annobin coverage, so we add the assembler flag to generate notes
+for them.
+
+The patch also adds notes to libgcc_s.so, but this is harmless because
+these notes only confer that there is no other annobin markup.
+
+2018-07-25  Florian Weimer  <fweimer@redhat.com>
+
+	* Makefile.in (LIBGCC2_CFLAGS, CRTSTUFF_CFLAGS): Add
+	-Wa,--generate-missing-build-notes=yes.
+
+--- libgcc/Makefile.in	2018-01-13 13:05:41.000000000 +0100
+++ libgcc/Makefile.in	2018-07-25 13:15:02.036226940 +0200
+@@ -246,6 +246,7 @@ LIBGCC2_DEBUG_CFLAGS = -g
+ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
+ 		 $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
+ 		 -fbuilding-libgcc -fno-stack-protector \
+		 -Wa,--generate-missing-build-notes=yes \
+ 		 $(INHIBIT_LIBC_CFLAGS)
+ 
+ # Additional options to use when compiling libgcc2.a.
+@@ -301,6 +302,7 @@ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(IN
+   $(NO_PIE_CFLAGS) -finhibit-size-directive -fno-inline -fno-exceptions \
+   -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
+   -fbuilding-libgcc -fno-stack-protector $(FORCE_EXPLICIT_EH_REGISTRY) \
+  -Wa,--generate-missing-build-notes=yes \
+   $(INHIBIT_LIBC_CFLAGS) $(USE_TM_CLONE_REGISTRY)
+ 
+ # Extra flags to use when compiling crt{begin,end}.o.
--- a/gcc12-sparc-config-detection.patch
+++ b/gcc12-sparc-config-detection.patch
@ -1,21 +1,21 @@
 --- gcc/config.gcc.jj	2008-04-24 15:42:46.000000000 -0500
 +++ gcc/config.gcc	2008-04-24 15:44:51.000000000 -0500
-@@ -3330,7 +3330,7 @@ sparc-*-rtems*)
- 	tm_file="${tm_file} elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
+@@ -2790,7 +2790,7 @@ sparc-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
 	tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems"
 	;;
 -sparc-*-linux*)
 +sparc-*-linux* | sparcv9-*-linux*)
- 	tm_file="${tm_file} elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
+ 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
 	extra_options="${extra_options} sparc/long-double-switch.opt"
 	case ${target} in
-@@ -3384,7 +3384,7 @@ sparc64-*-rtems*)
+@@ -2844,7 +2844,7 @@ sparc64-*-rtems*)
 	extra_options="${extra_options}"
 	tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64"
 	;;
 -sparc64-*-linux*)
 +sparc64*-*-linux*)
- 	tm_file="sparc/biarch64.h ${tm_file} elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h"
+ 	tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/default64.h sparc/linux64.h sparc/tso.h"
 	extra_options="${extra_options} sparc/long-double-switch.opt"
 	tmake_file="${tmake_file} sparc/t-sparc sparc/t-linux64"
 --- libgcc/config.host.jj	2008-04-24 15:46:19.000000000 -0500
--- a/gcc16-pr119006.patch
+++ b/gcc16-pr119006.patch
@ -1,76 +0,0 @@
-2025-02-27  Jakub Jelinek  <jakub@redhat.com>
-
-	PR ipa/119006
-	* ipa-icf-gimple.cc (func_checker::compare_operand): If t1 and t2
-	are ADDR_EXPRs, call operand_equal_p on their operands rather than on
-	the ADDR_EXPRs themselves.  Formatting fix.
-
-	* g++.dg/opt/pr119006.C: New test.
-
--- gcc/ipa-icf-gimple.cc.jj	2025-02-01 00:50:02.080774328 +0100
-+++ gcc/ipa-icf-gimple.cc	2025-02-27 14:35:19.931183246 +0100
-@@ -437,12 +437,23 @@ func_checker::compare_operand (tree t1,
- 		 ("compare_ao_refs failed (dependence clique difference)");
-       gcc_unreachable ();
-     }
-+  else if (TREE_CODE (t1) == ADDR_EXPR && TREE_CODE (t2) == ADDR_EXPR)
-+    {
-+      /* For ADDR_EXPR compare the operands of the ADDR_EXPR rather than
-+	 the ADDR_EXPRs themselves.  operand_equal_p will compare the
-+	 operands with OEP_ADDRESS_OF and only care about the value
-+	 of the ADDR_EXPR, rather than e.g. types of MEM_REFs in there.
-+	 Some optimizations use such details though, see PR119006.  */
-+      if (operand_equal_p (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0),
-+			   OEP_MATCH_SIDE_EFFECTS))
-+	return true;
-+      return return_false_with_msg ("operand_equal_p failed");
-+    }
-   else
-     {
-       if (operand_equal_p (t1, t2, OEP_MATCH_SIDE_EFFECTS))
- 	return true;
-      return return_false_with_msg
-		 ("operand_equal_p failed");
-+      return return_false_with_msg ("operand_equal_p failed");
-     }
- }
- 
--- gcc/testsuite/g++.dg/opt/pr119006.C.jj	2025-02-27 14:37:05.952707350 +0100
-+++ gcc/testsuite/g++.dg/opt/pr119006.C	2025-02-27 14:36:29.251218260 +0100
-@@ -0,0 +1,36 @@
-+// PR ipa/119006
-+// { dg-do run { target c++11 } }
-+// { dg-options "-O2 -fwhole-program" }
-+
-+struct A {
-+  bool operator== (const char *x) const { return x && !__builtin_strcmp (a, x); }
-+  char a[11];
-+};
-+
-+struct B {
-+  bool operator== (const char *x) const { return x && !__builtin_strcmp (a, x); }
-+  bool operator!= (const char *x) const { return !(*this == x); }
-+  char a[128];
-+};
-+
-+[[gnu::noinline,gnu::used]] int
-+foo (const A& lhs, const char* rhs)
-+{
-+  return lhs == rhs;
-+}
-+
-+constexpr const char *t = "abcdefghijklmno";
-+
-+[[gnu::noinline,gnu::used]] void
-+bar (B x)
-+{
-+  if (x != t) __builtin_abort ();
-+}
-+
-+int
-+main ()
-+{
-+  B b;
-+  __builtin_strcpy (b.a, t);
-+  bar (b);
-+}
--- a/gcc16-pr123273.patch
+++ b/gcc16-pr123273.patch
@ -1,54 +0,0 @@
-2026-01-06  Jakub Jelinek  <jakub@redhat.com>
-
-	PR preprocessor/123273
-	* lex.cc (cpp_directive_only_process): Only go to done_comment
-	for '/' if star is true and esc is false.  When seeing '\\' with
-	esc set to true, clear esc as well as star instead of keeping esc
-	set.
-
-	* c-c++-common/cpp/dir-only-10.c: New test.
-	* c-c++-common/cpp/dir-only-11.c: New test.
-
--- libcpp/lex.cc.jj	2026-01-02 09:56:10.417332292 +0100
-+++ libcpp/lex.cc	2026-01-05 16:40:26.413766032 +0100
-@@ -5461,7 +5461,13 @@ cpp_directive_only_process (cpp_reader *
- 		    switch (c)
- 		      {
- 		      case '\\':
-			esc = true;
-+			if (esc)
-+			  {
-+			    star = false;
-+			    esc = false;
-+			  }
-+			else
-+			  esc = true;
- 			break;
- 
- 		      case '\r':
-@@ -5492,7 +5498,7 @@ cpp_directive_only_process (cpp_reader *
- 			break;
- 
- 		      case '/':
-			if (star)
-+			if (star && !esc)
- 			  goto done_comment;
- 			/* FALLTHROUGH  */
- 
--- gcc/testsuite/c-c++-common/cpp/dir-only-10.c.jj	2026-01-05 17:04:26.144566116 +0100
-+++ gcc/testsuite/c-c++-common/cpp/dir-only-10.c	2026-01-05 17:05:02.226946201 +0100
-@@ -0,0 +1,5 @@
-+/* PR preprocessor/123273 */
-+/* { dg-do preprocess } */
-+/* { dg-options -fdirectives-only } */
-+
-+/* *\/""" */
--- gcc/testsuite/c-c++-common/cpp/dir-only-11.c.jj	2026-01-05 17:05:18.498666647 +0100
-+++ gcc/testsuite/c-c++-common/cpp/dir-only-11.c	2026-01-05 17:06:17.574651691 +0100
-@@ -0,0 +1,6 @@
-+/* PR preprocessor/123273 */
-+/* { dg-do preprocess } */
-+/* { dg-options -fdirectives-only } */
-+
-+/* *\\
-+/""" */
--- a/gcc16-rh1574936.patch
+++ b/gcc16-rh1574936.patch
@ -1,21 +0,0 @@
-crt files and statically linked libgcc objects cause false positives
-in annobin coverage, so we add the assembler flag to generate notes
-for them.
-
-The patch also adds notes to libgcc_s.so, but this is harmless because
-these notes only confer that there is no other annobin markup.
-
-2018-07-25  Florian Weimer  <fweimer@redhat.com>
-
-	* config/t-linux (LIBGCC2_CFLAGS, CRTSTUFF_CFLAGS): Add
-	-Wa,--generate-missing-build-notes=yes.
-
--- libgcc/config/t-linux	2022-12-15 19:25:20.581394950 +0100
-+++ libgcc/config/t-linux	2023-03-21 22:00:37.054478562 +0100
-@@ -1,3 +1,6 @@
- # Override t-slibgcc-elf-ver to export some libgcc symbols with
- # the symbol versions that glibc used.
- SHLIB_MAPFILES += $(srcdir)/config/libgcc-glibc.ver
-+
-+LIBGCC2_CFLAGS += -Wa,--generate-missing-build-notes=yes
-+CRTSTUFF_CFLAGS += -Wa,--generate-missing-build-notes=yes
--- a/isl-rh2155127.patch
+++ b/isl-rh2155127.patch
@ -1,85 +0,0 @@
-From: Sven Verdoolaege <sven.verdoolaege@gmail.com>
-Date: Mon, 6 Jun 2022 12:56:02 +0000 (+0200)
-Subject: update m4/ax_prog_cc_for_build.m4
-X-Git-Tag: isl-0.25~11
-X-Git-Url: https://repo.or.cz/isl.git/commitdiff_plain/b4dcdfadc29a6c9f410a72f345f3f32725b1d38b
-
-update m4/ax_prog_cc_for_build.m4
-
-In particular, update to the latest version from the autoconf archive,
-but preserve the changes from isl-0.22.1-358-gcd42abdf2
-(m4/ax_prog_cc_for_build.m4: do not override host compiler dependency style,
-Tue Jun 9 10:54:10 2020 +0200).
-
-Signed-off-by: Sven Verdoolaege <sven.verdoolaege@gmail.com>
-
--- isl-0.24/m4/ax_prog_cc_for_build.m4.jj	2021-03-02 12:07:09.000000000 +0100
-+++ isl-0.24/m4/ax_prog_cc_for_build.m4	2022-12-20 18:11:18.855777817 +0100
-@@ -32,7 +32,7 @@
- #   and this notice are preserved. This file is offered as-is, without any
- #   warranty.
- 
-#serial 18
-+#serial 21
- 
- AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
- AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
-@@ -44,6 +44,8 @@ dnl Use the standard macros, but make th
- dnl
- pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
- pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl
-+pushdef([ac_cv_prog_cc_c99], ac_cv_build_prog_cc_c99)dnl
-+pushdef([ac_cv_prog_cc_c11], ac_cv_build_prog_cc_c11)dnl
- pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
- pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
- pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
-@@ -86,7 +88,21 @@ AS_IF([test -n "$build"],      [ac_build
-       [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"])
- 
- AC_LANG_PUSH([C])
-+
-+dnl The pushdef([ac_cv_c_compiler_gnu], ...) currently does not cover
-+dnl the use of this variable in _AC_LANG_COMPILER_GNU called by
-+dnl AC_PROG_CC. Unset this cache variable temporarily as a workaround.
-+was_set_c_compiler_gnu=${[ac_cv_c_compiler_gnu]+y}
-+AS_IF([test ${was_set_c_compiler_gnu}],
-+    [saved_c_compiler_gnu=$[ac_cv_c_compiler_gnu]
-+    AS_UNSET([[ac_cv_c_compiler_gnu]])])
-+
- AC_PROG_CC
-+
-+dnl Restore ac_cv_c_compiler_gnu
-+AS_IF([test ${was_set_c_compiler_gnu}],
-+  [[ac_cv_c_compiler_gnu]=$[saved_c_compiler_gnu]])
-+
- _AC_COMPILER_EXEEXT
- _AC_COMPILER_OBJEXT
- AC_PROG_CPP
--- isl-0.24/configure.jj	2021-04-26 11:13:19.000000000 +0200
-+++ isl-0.24/configure	2022-12-20 18:11:36.882518568 +0100
-@@ -5002,6 +4990,13 @@ ac_compile='$CC_FOR_BUILD -c $CFLAGS_FOR
- ac_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_build_c_compiler_gnu
- 
-+
-+was_set_c_compiler_gnu=${ac_cv_c_compiler_gnu+y}
-+if test ${was_set_c_compiler_gnu}; then :
-+  saved_c_compiler_gnu=$ac_cv_c_compiler_gnu
-+    { ac_cv_c_compiler_gnu=; unset ac_cv_c_compiler_gnu;}
-+fi
-+
- ac_ext=c
- ac_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD'
- ac_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5'
-@@ -5728,6 +5723,11 @@ else
- fi
- 
- 
-+
-+if test ${was_set_c_compiler_gnu}; then :
-+  ac_cv_c_compiler_gnu=$saved_c_compiler_gnu
-+fi
-+
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@ -1,7 +1,7 @@
 summary: CI Gating Plan
 discover:
    how: fmf
-    url: https://gitlab.com/redhat/centos-stream/tests/gcc.git
+    url: https://src.fedoraproject.org/tests/gcc.git
    filter: 'tag: Fedora-CI-gating'
 execute:
    how: tmt
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -1,37 +0,0 @@
-inspections:
-    # GCC subpackages are inter-dependent but without requesting an explicit
-    # version - which rpmdeps dislikes and creates huge reports. We can't fix
-    # it easily and it's not a practical problem anyway. Unfortunately we
-    # can't tell rpmdeps to ignore just that particular warning. Switching off
-    # the rpmdeps checks looks like a lesser evil.
-    rpmdeps: off
-
-badfuncs:
-    # GCC doesn't use the so called bad functions "much". If they appear then
-    # - it is instrumenting them in sanitizers
-    # - in languages that don't move further downstream.
-    # We are OK with that.
-    ignore:
-      - /usr/lib*/libasan.so.*.*.*
-      - /usr/lib*/libtsan.so.*.*.*
-      - /usr/lib*/libgnat-*.so
-      - /usr/lib*/libgphobos.so.*.*.*
-      - /usr/lib*/libm2iso.so.*.*.*
-      - /usr/lib*/libm2pim.so.*.*.*
-
-pathmigration:
-    # Incomplete UsrMove, known but not planned at the moment
-    ignore:
-      - /lib*/libgcc_s-*.so.*
-      - /lib*/libgcc_s.so.*
-
-debuginfo:
-    # Skip the Go binaries, they ship unstripped
-    ignore:
-      - /usr/bin/go.gcc
-      - /usr/bin/gofmt.gcc
-      - /usr/lib*/libgo.so.*.*.*
-      - /usr/libexec/gcc/*-redhat-linux/*/buildid
-      - /usr/libexec/gcc/*-redhat-linux/*/cgo
-      - /usr/libexec/gcc/*-redhat-linux/*/test2json
-      - /usr/libexec/gcc/*-redhat-linux/*/vet
--- a/6
+++ b/6
@ -1,4 +1,4 @@
-SHA512 (gcc-16.0.1-20260115.tar.xz) = 51ab079dedde5547caba601ce03954d4c5b2bf687538f106d3e851a8918162017fe65817d9e22fd115cf4d4f970bfba6a70a34db183141ce28c5c203a68eec0b
+SHA512 (gcc-12.3.1-20230508.tar.xz) = 6e9458f85a081d5ab5bdb4acd988b7c1d877870069d853310e5d64fd678f1420ff6db8c096aeb1a4349de6881949040bcef70b670daa603fdd0e06a7a8e03829
 SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95
-SHA512 (newlib-cygwin-d35cc82b5ec15bb8a5fe0fe11e183d1887992e99.tar.xz) = ef9495745a96d1d76f9f425c4a48c807fface36a1aa92351c5d024103678d144d046e8de55d195103784472c14874e29e4b9284d5d6a2e7bb27fd98c8455a881
-SHA512 (nvptx-tools-a0c1fff6534a4df9fb17937c3c4a4b1071212029.tar.xz) = 7f862986065028df70c843fc3f2c89e200a76b48ad0bd51c749ac8a5aab7be0ebdf35be182fad2407b3281615e75be1ac6833ab6a5130ae9920169a0412f94f0
+SHA512 (newlib-cygwin-a8526cb52bedabd4d6ba4b227a5185627f871aa1.tar.xz) = b099246fe4a5d0a372cdaee5da49083df5b2f4440a4e83961600cdf22d37da50c99ce9ae46b769f188a67034ee038cf863260988fc9d594e8e5fb3905a381dec
+SHA512 (nvptx-tools-472b6e78b3ba918d727698f79911360b7c808247.tar.xz) = 91690321bf96460c3b3e229199a6f752ed1c27c6933d4345dc7e237dc068f604ad211bb3a0373e14d4f332bee05b6227d6933e14e0b475ffdfea8b511ab735e6
--- a/update-gcc.sh
+++ b/update-gcc.sh
@ -1,36 +1,7 @@
 #!/bin/sh
-if [ "$#" -eq 0 ]; then
-  echo "Usage: ./update-gcc.sh gcc/redhat/heads/gcc-NN-branch_commit_hash [git_reference_dir_to_speed_up]"
-  exit 1
-fi
-export LC_ALL=C
-if ! [ -f gcc.spec ]; then echo Must be run in the directory with gcc.spec file.; exit 1; fi
-if [ -d gcc-dir.tmp ]; then echo gcc-dir.tmp already exists.; exit 1; fi
-v=`sed -n 's/^%global gcc_version //p' gcc.spec`
-p=`sed -n 's/^%global gitrev //p' gcc.spec`
-h=$1
-if [ "$#" -ge 2 ]; then
-  git clone --dissociate --reference $2 https://gcc.gnu.org/git/gcc.git gcc-dir.tmp
-else
-  git clone https://gcc.gnu.org/git/gcc.git gcc-dir.tmp
-fi
-git --git-dir=gcc-dir.tmp/.git fetch origin $h
+[ -d gcc-dir.tmp ] && echo gcc-dir.tmp already exists && exit 1
+git clone --depth 1 git://gcc.gnu.org/git/gcc.git gcc-dir.tmp
+git --git-dir=gcc-dir.tmp/.git fetch --depth 1 origin $1
 d=`date --iso | sed 's/-//g'`
-cd gcc-dir.tmp
-git diff $p..$h > P1
-git log --format=%B `git log --format='%ae %H' $p..$h | awk '/^gccadmin@gcc.gnu.org/{print $2;exit 0}'`..$h > P2
-diff -up /dev/null P2 >> P1
-sed -n 's,^+[[:blank:]]\+PR \([a-z0-9+-]\+/[0-9]\+\)$,\1,p' P1 | sed 's/ - .*$//;s/[: ;.]//g' | LC_ALL=C sort -u -t / -k 1,1 -k 2,2n > P3
-> P4
-for i in `cat P3`; do if grep -F $i ../gcc.spec >/dev/null; then echo $i already recorded.; else echo $i >> P4; fi; done
-case "$v" in
-  *.0.*) echo "- update from trunk" > P5;;
-  *) echo "- update from releases/gcc-`echo $v | sed 's/\..*$//'` branch" > P5;;
-esac
-echo `cat P4` | sed 's/ /, /g' | fold -w 71 -s | sed '1s/^/  - PRs /;2,$s/^/	/;s/, $/,/' >> P5
-echo >> P5
-cd ..
-sed -i -e '/^%global gitrev /s/ [0-9a-f]\+$/ '$h'/;/^%global DATE /s/ [0-9]\+$/ '$d'/;/^%changelog$/r gcc-dir.tmp/P5' gcc.spec
-git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-$v-$d/ $h | xz -9e > gcc-$v-$d.tar.xz
+git --git-dir=gcc-dir.tmp/.git archive --prefix=gcc-12.3.1-$d/ $1 | xz -9e > gcc-12.3.1-$d.tar.xz
 rm -rf gcc-dir.tmp
-fedpkg new-sources gcc-$v-$d.tar.xz `sed 's/SHA512 (\(.*\)) = [0-9a-f]\+$/\1/' sources | grep -v '^gcc-'`