diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec
index dcf3986..734e16e 100644
--- a/cross-aarch64-gcc13-bootstrap.spec
+++ b/cross-aarch64-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec
index 169ac42..10533ea 100644
--- a/cross-aarch64-gcc13.spec
+++ b/cross-aarch64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec
index b742c42..c48f0a4 100644
--- a/cross-amdgcn-gcc13.spec
+++ b/cross-amdgcn-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec
index 59c09d8..0ac2f42 100644
--- a/cross-arm-gcc13.spec
+++ b/cross-arm-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec
index 7976e27..42fa900 100644
--- a/cross-arm-none-gcc13-bootstrap.spec
+++ b/cross-arm-none-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -631,6 +631,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -643,6 +647,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -670,34 +675,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec
index a650c06..f3a10eb 100644
--- a/cross-arm-none-gcc13.spec
+++ b/cross-arm-none-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec
index dcd13d6..e87f6dd 100644
--- a/cross-avr-gcc13-bootstrap.spec
+++ b/cross-avr-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec
index 9a97a53..90994d7 100644
--- a/cross-avr-gcc13.spec
+++ b/cross-avr-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec
index 71cf235..0118eab 100644
--- a/cross-bpf-gcc13.spec
+++ b/cross-bpf-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec
index eba094b..17b6ab6 100644
--- a/cross-epiphany-gcc13-bootstrap.spec
+++ b/cross-epiphany-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -631,6 +631,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -643,6 +647,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -670,34 +675,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec
index 614a9e3..a1d165f 100644
--- a/cross-epiphany-gcc13.spec
+++ b/cross-epiphany-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec
index 76b6d00..0cb3a6d 100644
--- a/cross-hppa-gcc13-bootstrap.spec
+++ b/cross-hppa-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec
index 9ae5e22..3d27866 100644
--- a/cross-hppa-gcc13.spec
+++ b/cross-hppa-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec
index e53ab48..c45992d 100644
--- a/cross-m68k-gcc13.spec
+++ b/cross-m68k-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec
index 4d0486c..0ae878d 100644
--- a/cross-mips-gcc13.spec
+++ b/cross-mips-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec
index 0fbf4cd..e261b5d 100644
--- a/cross-nvptx-gcc13.spec
+++ b/cross-nvptx-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec
index 7b3083d..96c0ee4 100644
--- a/cross-ppc64-gcc13.spec
+++ b/cross-ppc64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec
index aa06724..b01b408 100644
--- a/cross-ppc64le-gcc13.spec
+++ b/cross-ppc64le-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec
index 4afd2ff..7194ccf 100644
--- a/cross-pru-gcc13-bootstrap.spec
+++ b/cross-pru-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -631,6 +631,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -643,6 +647,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -670,34 +675,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec
index a66d911..1f40652 100644
--- a/cross-pru-gcc13.spec
+++ b/cross-pru-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec
index 5e1d63b..c846702 100644
--- a/cross-riscv64-elf-gcc13-bootstrap.spec
+++ b/cross-riscv64-elf-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -631,6 +631,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -643,6 +647,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -670,34 +675,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec
index 48fae33..2630336 100644
--- a/cross-riscv64-elf-gcc13.spec
+++ b/cross-riscv64-elf-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec
index 0509a4e..86ca4bf 100644
--- a/cross-riscv64-gcc13-bootstrap.spec
+++ b/cross-riscv64-gcc13-bootstrap.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec
index 4316211..febffca 100644
--- a/cross-riscv64-gcc13.spec
+++ b/cross-riscv64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec
index 27fb48d..168f680 100644
--- a/cross-rx-gcc13-bootstrap.spec
+++ b/cross-rx-gcc13-bootstrap.spec
@@ -108,7 +108,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -631,6 +631,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -643,6 +647,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -670,34 +675,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec
index 27a5146..1ab8e37 100644
--- a/cross-rx-gcc13.spec
+++ b/cross-rx-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec
index f38acf4..fbcabbe 100644
--- a/cross-s390x-gcc13.spec
+++ b/cross-s390x-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec
index 72f0571..8cc980f 100644
--- a/cross-sparc-gcc13.spec
+++ b/cross-sparc-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec
index fa50d4b..0c88587 100644
--- a/cross-sparc64-gcc13.spec
+++ b/cross-sparc64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec
index fc7c8b0..14f3ee1 100644
--- a/cross-x86_64-gcc13.spec
+++ b/cross-x86_64-gcc13.spec
@@ -107,7 +107,7 @@ Name:           %{pkgname}
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -630,6 +630,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -642,6 +646,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -669,34 +674,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/gcc-13.1.1+git7364.tar.xz b/gcc-13.1.1+git7364.tar.xz
deleted file mode 100644
index a1a2ffa..0000000
--- a/gcc-13.1.1+git7364.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3368bca3b7d5e231bd20d12fd75869aaea08373b8863668c37d22611b8639d7
-size 87100668
diff --git a/gcc-13.1.1+git7552.tar.xz b/gcc-13.1.1+git7552.tar.xz
new file mode 100644
index 0000000..7cd9e70
--- /dev/null
+++ b/gcc-13.1.1+git7552.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98b95d594a6cbb5c270be7214c45873e87b0b28194833e7837c54438748918fc
+size 86948796
diff --git a/gcc.spec.in b/gcc.spec.in
index 2c91c7d..a27a2c7 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -204,7 +204,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:          https://gcc.gnu.org/
-Version: 13.1.1+git7364
+Version: 13.1.1+git7552
 Release:      1
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -1641,6 +1641,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -1653,6 +1657,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -1680,34 +1685,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec
index 9011ccf..92184c2 100644
--- a/gcc13-testresults.spec
+++ b/gcc13-testresults.spec
@@ -221,7 +221,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -832,6 +832,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -844,6 +848,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -871,34 +876,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
diff --git a/gcc13.changes b/gcc13.changes
index fa570dc..94b2d6d 100644
--- a/gcc13.changes
+++ b/gcc13.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Jul 10 08:12:40 UTC 2023 - Richard Biener <rguenther@suse.com>
+
+- Bump to f9781fcf733ca3afe5b5811afd8ecbb18d9d3a11, git7552
+- Remove gcc13-pr110334.patch again as it breaks libreoffice build.
+
+-------------------------------------------------------------------
+Wed Jun 28 06:56:52 UTC 2023 - Richard Biener <rguenther@suse.com>
+
+- Bump to a533ded17fb13cbbb2fa5133ecd470360f66c5cf, git7489.
+- Add gcc13-pr110334.patch to fix missed optimization in Skia
+  resulting in Firefox crashes when building with LTO.  [boo#1212101]
+
+-------------------------------------------------------------------
+Tue Jun 13 09:22:50 UTC 2023 - Richard Biener <rguenther@suse.com>
+
+- Raise architecture levels for ALP.  [PED-153]
+  * Raise POWER architecture baseline to power9.  [PED-2005]
+  * Raise x86-64 architecture baseline to x86-64-v2 for ALP.  [PED-252]
+  * Delay raising s390x architecture baseline to z14.  [PED-253]
+
 -------------------------------------------------------------------
 Mon May 22 09:05:30 UTC 2023 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc13.spec b/gcc13.spec
index 7d9beb4..87fdf0b 100644
--- a/gcc13.spec
+++ b/gcc13.spec
@@ -200,7 +200,7 @@
 %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64
 
 URL:            https://gcc.gnu.org/
-Version:        13.1.1+git7364
+Version:        13.1.1+git7552
 Release:        0
 %define gcc_dir_version %(echo %version |  sed 's/+.*//' | cut -d '.' -f 1)
 %define gcc_snapshot_revision %(echo %version | sed 's/[3-9]\.[0-9]\.[0-6]//' | sed 's/+/-/')
@@ -2649,6 +2649,10 @@ amdgcn-amdhsa,\
 	--enable-fix-cortex-a53-843419 \
 %endif
 %if "%{TARGET_ARCH}" == "powerpc64le"
+%if %{suse_version} >= 1600
+	--with-cpu=power9 \
+	--with-tune=power9 \
+%else
 %if %{suse_version} >= 1350
 	--with-cpu=power8 \
 	--with-tune=power9 \
@@ -2661,6 +2665,7 @@ amdgcn-amdhsa,\
 	--with-tune=power7 \
 %endif
 %endif
+%endif
 %if %{suse_version} > 1500
 	--with-long-double-format=ieee \
 %else
@@ -2688,34 +2693,53 @@ amdgcn-amdhsa,\
 	--with-long-double-128 \
 %endif
 %if "%{TARGET_ARCH}" == "i586"
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 %if 0%{?sle_version:%sle_version} >= 150000
 	--with-arch-32=x86-64 \
 %else
 	--with-arch-32=i586 \
+%endif
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "x86_64"
 %ifnarch %{disable_multilib_arch}
 	--enable-multilib \
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch-32=x86-64-v2 \
+%else
 	--with-arch-32=x86-64 \
+%endif
+%endif
+%if %{suse_version} >= 1600 && !0%{?is_opensuse}
+	--with-arch=x86-64-v2 \
 %endif
 	--with-tune=generic \
 %endif
 %if "%{TARGET_ARCH}" == "s390"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \
 %endif
 %if "%{TARGET_ARCH}" == "s390x"
+%if %{suse_version} >= 1600
+        --with-tune=zEC12 --with-arch=z196 \
+%else
 %if %{suse_version} >= 1310
         --with-tune=zEC12 --with-arch=z196 \
 %else
 	--with-tune=z9-109 --with-arch=z900 \
+%endif
 %endif
 	--with-long-double-128 \
 	--enable-decimal-float \