diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec
index 6eb7fee..7003765 100644
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec
index f78cbc0..72d8d25 100644
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec
index 62a44fe..78a016e 100644
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec
index 28ddde7..655c7dc 100644
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec
index 95b3bdd..93a8a67 100644
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@@ -128,6 +128,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -329,6 +330,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec
index c6f576f..4ac51da 100644
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec
index fae8369..189b8e9 100644
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec
index 06b119b..dd86d08 100644
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec
index 53839d7..56597d5 100644
--- a/cross-epiphany-gcc13-bootstrap.spec
+++ b/cross-epiphany-gcc13-bootstrap.spec
@@ -128,6 +128,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -329,6 +330,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec
index c390edd..6592897 100644
--- a/cross-epiphany-gcc13.spec
+++ b/cross-epiphany-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec
index b04f35a..dccdb6e 100644
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec
index aedee3b..b91d925 100644
--- a/cross-hppa-gcc13.spec
+++ b/cross-hppa-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec
index b0e0771..30e0d83 100644
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec
index 1cd5ad8..c034d66 100644
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec
index 2ab536c..ec35b3c 100644
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec
index 5b4fd5f..bffdba1 100644
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec
index 8ac310f..386671a 100644
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec
index 60560fe..59491bf 100644
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@@ -128,6 +128,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -329,6 +330,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec
index 5f421b5..c0784f5 100644
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec
index 479d1f0..ee26743 100644
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@@ -128,6 +128,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -329,6 +330,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec
index 147e00d..7e2df91 100644
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec
index 9f35bd1..dad8aca 100644
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec
index a2392db..f3219fd 100644
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec
index c7f3af7..3c49208 100644
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@@ -128,6 +128,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -329,6 +330,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec
index 1ddc900..ea0e59b 100644
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec
index fce70fa..5b2ac7a 100644
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec
index 1d64b21..86794c6 100644
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec
index 5e3a8c3..29e7aac 100644
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec
index d3a641d..ee89f15 100644
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@@ -127,6 +127,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -328,6 +329,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/gcc.spec.in b/gcc.spec.in
index 18e8cb6..b3b2635 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -373,6 +373,7 @@ Patch17:	gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:	gcc10-amdgcn-llvm-as.patch
 Patch19:	gcc11-gdwarf-4-default.patch
 Patch20:	gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:	gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:	gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -1214,6 +1215,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/gcc13-pr107678.patch b/gcc13-pr107678.patch
new file mode 100644
index 0000000..9c50cac
--- /dev/null
+++ b/gcc13-pr107678.patch
@@ -0,0 +1,113 @@
+A recent change only initializes the regs.how[] during Dwarf unwinding
+which resulted in an uninitialized offset used in return address signing
+and random failures during unwinding.  The fix is to encode the return
+address signing state in REG_UNSAVED and REG_UNDEFINED.
+
+2023-01-10  Wilco Dijkstra  <Wilco.Dijkstra@arm.com>
+
+	PR target/107678
+	* unwind-dw2.c (RA_SIGNED_BIT): Remove.
+	* unwind-dw2-execute_cfa.h: Use REG_UNSAVED/UNDEFINED
+	to encode return address signing state.
+	* config/aarch64/aarch64-unwind.h (aarch64_demangle_return_addr)
+	Check current return address signing state.
+	(aarch64_frob_update_contex): Remove.
+
+--- libgcc/config/aarch64/aarch64-unwind.h
++++ libgcc/config/aarch64/aarch64-unwind.h
+@@ -29,8 +29,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ 
+ #define MD_DEMANGLE_RETURN_ADDR(context, fs, addr) \
+   aarch64_demangle_return_addr (context, fs, addr)
+-#define MD_FROB_UPDATE_CONTEXT(context, fs) \
+-  aarch64_frob_update_context (context, fs)
+ 
+ static inline int
+ aarch64_cie_signed_with_b_key (struct _Unwind_Context *context)
+@@ -55,42 +53,27 @@ aarch64_cie_signed_with_b_key (struct _Unwind_Context *context)
+ 
+ static inline void *
+ aarch64_demangle_return_addr (struct _Unwind_Context *context,
+-			      _Unwind_FrameState *fs ATTRIBUTE_UNUSED,
++			      _Unwind_FrameState *fs,
+ 			      _Unwind_Word addr_word)
+ {
+   void *addr = (void *)addr_word;
+-  if (context->flags & RA_SIGNED_BIT)
++  const int reg = DWARF_REGNUM_AARCH64_RA_STATE;
++
++  if (fs->regs.how[reg] == REG_UNSAVED)
++    return addr;
++
++  /* Return-address signing state is toggled by DW_CFA_GNU_window_save (where
++     REG_UNDEFINED means enabled), or set by a DW_CFA_expression.  */
++  if (fs->regs.how[reg] == REG_UNDEFINED
++      || (_Unwind_GetGR (context, reg) & 0x1) != 0)
+     {
+       _Unwind_Word salt = (_Unwind_Word) context->cfa;
+       if (aarch64_cie_signed_with_b_key (context) != 0)
+ 	return __builtin_aarch64_autib1716 (addr, salt);
+       return __builtin_aarch64_autia1716 (addr, salt);
+     }
+-  else
+-    return addr;
+-}
+-
+-/* Do AArch64 private initialization on CONTEXT based on frame info FS.  Mark
+-   CONTEXT as return address signed if bit 0 of DWARF_REGNUM_AARCH64_RA_STATE is
+-   set.  */
+-
+-static inline void
+-aarch64_frob_update_context (struct _Unwind_Context *context,
+-			     _Unwind_FrameState *fs)
+-{
+-  const int reg = DWARF_REGNUM_AARCH64_RA_STATE;
+-  int ra_signed;
+-  if (fs->regs.how[reg] == REG_UNSAVED)
+-    ra_signed = fs->regs.reg[reg].loc.offset & 0x1;
+-  else
+-    ra_signed = _Unwind_GetGR (context, reg) & 0x1;
+-  if (ra_signed)
+-    /* The flag is used for re-authenticating EH handler's address.  */
+-    context->flags |= RA_SIGNED_BIT;
+-  else
+-    context->flags &= ~RA_SIGNED_BIT;
+ 
+-  return;
++  return addr;
+ }
+ 
+ #endif /* defined AARCH64_UNWIND_H && defined __ILP32__ */
+--- libgcc/unwind-dw2.c
++++ libgcc/unwind-dw2.c
+@@ -137,9 +137,6 @@ struct _Unwind_Context
+ #define SIGNAL_FRAME_BIT ((~(_Unwind_Word) 0 >> 1) + 1)
+   /* Context which has version/args_size/by_value fields.  */
+ #define EXTENDED_CONTEXT_BIT ((~(_Unwind_Word) 0 >> 2) + 1)
+-  /* Bit reserved on AArch64, return address has been signed with A or B
+-     key.  */
+-#define RA_SIGNED_BIT ((~(_Unwind_Word) 0 >> 3) + 1)
+   _Unwind_Word flags;
+   /* 0 for now, can be increased when further fields are added to
+      struct _Unwind_Context.  */
+--- libgcc/unwind-dw2-execute_cfa.h	2023-01-02 17:53:56.003021412 +0100
++++ libgcc/unwind-dw2-execute_cfa.h	2023-01-12 19:52:05.456327742 +0100
+@@ -278,10 +278,15 @@
+ 	case DW_CFA_GNU_window_save:
+ #if defined (__aarch64__) && !defined (__ILP32__)
+ 	  /* This CFA is multiplexed with Sparc.  On AArch64 it's used to toggle
+-	     return address signing status.  */
++	     return address signing status.  The REG_UNDEFINED/UNSAVED states
++	     mean RA signing is enabled/disabled.  */
+ 	  reg = DWARF_REGNUM_AARCH64_RA_STATE;
+-	  gcc_assert (fs->regs.how[reg] == REG_UNSAVED);
+-	  fs->regs.reg[reg].loc.offset ^= 1;
++	  gcc_assert (fs->regs.how[reg] == REG_UNSAVED
++		      || fs->regs.how[reg] == REG_UNDEFINED);
++	  if (fs->regs.how[reg] == REG_UNSAVED)
++	    fs->regs.how[reg] = REG_UNDEFINED;
++	  else
++	    fs->regs.how[reg] = REG_UNSAVED;
+ #else
+ 	  /* ??? Hardcoded for SPARC register window configuration.  */
+ 	  if (__LIBGCC_DWARF_FRAME_REGISTERS__ >= 32)
diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec
index 69f0bf1..0f22dd8 100644
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@@ -389,6 +389,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -527,6 +528,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61
diff --git a/gcc13.changes b/gcc13.changes
index 6d44548..444e3cb 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -5,6 +5,8 @@ Mon Jan 16 11:59:43 UTC 2023 - Richard Biener <rguenther@suse.com>
   * pulls changes up to the start of Stage 4
 - Change version numbering to match the commit count from
   the git gcc-descr alias
+- Add gcc13-pr107678.patch to fix unwinding on aarch64 with
+  pointer signing.  [bsc#1206684]
 
 -------------------------------------------------------------------
 Tue Dec 27 11:13:16 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
diff --git a/gcc13.spec b/gcc13.spec
index b20a638..1fd7612 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -368,6 +368,7 @@ Patch17:        gcc9-reproducible-builds-buildid-for-checksum.patch
 Patch18:        gcc10-amdgcn-llvm-as.patch
 Patch19:        gcc11-gdwarf-4-default.patch
 Patch20:        gcc11-amdgcn-disable-hot-cold-partitioning.patch
+Patch21:        gcc13-pr107678.patch
 # A set of patches from the RH srpm
 Patch51:        gcc41-ppc32-retaddr.patch
 # Some patches taken from Debian
@@ -2027,6 +2028,7 @@ ln -s newlib-4.2.0.20211231/newlib .
 %if %{suse_version} < 1550
 %patch19 -p1
 %endif
+%patch21 -p0
 %patch51
 %patch60 -p1
 %patch61