From 882160ed6418248111e9935f14f8adfa9f08a37e434ea9e7771a8c512c67402e Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 28 Aug 2023 10:51:17 +0000 Subject: [PATCH] - Raise s390x architecture baseline to z14 for ALP. [PED-253] OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=67 --- cross-aarch64-gcc13-bootstrap.spec | 19 +++---------------- cross-aarch64-gcc13.spec | 19 +++---------------- cross-amdgcn-gcc13.spec | 19 +++---------------- cross-arm-gcc13.spec | 19 +++---------------- cross-arm-none-gcc13-bootstrap.spec | 19 +++---------------- cross-arm-none-gcc13.spec | 19 +++---------------- cross-avr-gcc13-bootstrap.spec | 19 +++---------------- cross-avr-gcc13.spec | 19 +++---------------- cross-bpf-gcc13.spec | 19 +++---------------- cross-epiphany-gcc13-bootstrap.spec | 19 +++---------------- cross-epiphany-gcc13.spec | 19 +++---------------- cross-hppa-gcc13-bootstrap.spec | 19 +++---------------- cross-hppa-gcc13.spec | 19 +++---------------- cross-m68k-gcc13.spec | 19 +++---------------- cross-mips-gcc13.spec | 19 +++---------------- cross-nvptx-gcc13.spec | 19 +++---------------- cross-ppc64-gcc13.spec | 19 +++---------------- cross-ppc64le-gcc13.spec | 19 +++---------------- cross-pru-gcc13-bootstrap.spec | 19 +++---------------- cross-pru-gcc13.spec | 19 +++---------------- cross-riscv64-elf-gcc13-bootstrap.spec | 19 +++---------------- cross-riscv64-elf-gcc13.spec | 19 +++---------------- cross-riscv64-gcc13-bootstrap.spec | 19 +++---------------- cross-riscv64-gcc13.spec | 19 +++---------------- cross-rx-gcc13-bootstrap.spec | 19 +++---------------- cross-rx-gcc13.spec | 19 +++---------------- cross-s390x-gcc13-bootstrap.spec | 19 +++---------------- cross-s390x-gcc13.spec | 19 +++---------------- cross-sparc-gcc13.spec | 19 +++---------------- cross-sparc64-gcc13.spec | 19 +++---------------- cross-x86_64-gcc13.spec | 19 +++---------------- gcc.spec.in | 19 +++---------------- gcc13-testresults.spec | 19 +++---------------- gcc13.changes | 1 + gcc13.spec | 19 +++---------------- 35 files changed, 103 insertions(+), 544 deletions(-) diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec index 62a123e..333bdd2 100644 --- a/cross-aarch64-gcc13-bootstrap.spec +++ b/cross-aarch64-gcc13-bootstrap.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec index 9d775d1..eba3243 100644 --- a/cross-aarch64-gcc13.spec +++ b/cross-aarch64-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec index b749b23..da567cc 100644 --- a/cross-amdgcn-gcc13.spec +++ b/cross-amdgcn-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec index ecd0dc6..3be6e7b 100644 --- a/cross-arm-gcc13.spec +++ b/cross-arm-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec index 975eb0c..ace77f7 100644 --- a/cross-arm-none-gcc13-bootstrap.spec +++ b/cross-arm-none-gcc13-bootstrap.spec @@ -735,22 +735,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec index 17a866f..1cc1db1 100644 --- a/cross-arm-none-gcc13.spec +++ b/cross-arm-none-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec index 3291d8e..29e8414 100644 --- a/cross-avr-gcc13-bootstrap.spec +++ b/cross-avr-gcc13-bootstrap.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec index 64c30c6..9cc2fd7 100644 --- a/cross-avr-gcc13.spec +++ b/cross-avr-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec index 14b7f3b..6e59b95 100644 --- a/cross-bpf-gcc13.spec +++ b/cross-bpf-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec index db72bad..afa0db0 100644 --- a/cross-epiphany-gcc13-bootstrap.spec +++ b/cross-epiphany-gcc13-bootstrap.spec @@ -735,22 +735,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec index fcf1348..b18e112 100644 --- a/cross-epiphany-gcc13.spec +++ b/cross-epiphany-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec index 07c7e53..3144de8 100644 --- a/cross-hppa-gcc13-bootstrap.spec +++ b/cross-hppa-gcc13-bootstrap.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec index a57222d..85bbc15 100644 --- a/cross-hppa-gcc13.spec +++ b/cross-hppa-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec index 34ff459..3ebfd99 100644 --- a/cross-m68k-gcc13.spec +++ b/cross-m68k-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec index 6b9d2f7..f5ca26a 100644 --- a/cross-mips-gcc13.spec +++ b/cross-mips-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec index 54429ab..854a59c 100644 --- a/cross-nvptx-gcc13.spec +++ b/cross-nvptx-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec index 8200b70..8f20d9b 100644 --- a/cross-ppc64-gcc13.spec +++ b/cross-ppc64-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec index 31bb902..5398ab8 100644 --- a/cross-ppc64le-gcc13.spec +++ b/cross-ppc64le-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec index 9eebff7..a47903e 100644 --- a/cross-pru-gcc13-bootstrap.spec +++ b/cross-pru-gcc13-bootstrap.spec @@ -735,22 +735,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec index 13ab6eb..bcc7a6f 100644 --- a/cross-pru-gcc13.spec +++ b/cross-pru-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec index c40dfc3..300ebb3 100644 --- a/cross-riscv64-elf-gcc13-bootstrap.spec +++ b/cross-riscv64-elf-gcc13-bootstrap.spec @@ -735,22 +735,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec index 18e6cd8..ccd69ea 100644 --- a/cross-riscv64-elf-gcc13.spec +++ b/cross-riscv64-elf-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec index 7db7f27..700bab0 100644 --- a/cross-riscv64-gcc13-bootstrap.spec +++ b/cross-riscv64-gcc13-bootstrap.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec index 6bcb1db..edcd737 100644 --- a/cross-riscv64-gcc13.spec +++ b/cross-riscv64-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec index 6cde6df..39fa7fb 100644 --- a/cross-rx-gcc13-bootstrap.spec +++ b/cross-rx-gcc13-bootstrap.spec @@ -735,22 +735,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec index d5e709c..bfe8ab4 100644 --- a/cross-rx-gcc13.spec +++ b/cross-rx-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec index 0d40c43..d3e6ec2 100644 --- a/cross-s390x-gcc13-bootstrap.spec +++ b/cross-s390x-gcc13-bootstrap.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec index 74c0800..f57ebf1 100644 --- a/cross-s390x-gcc13.spec +++ b/cross-s390x-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec index f26cb86..d1e9419 100644 --- a/cross-sparc-gcc13.spec +++ b/cross-sparc-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec index 268232c..371059c 100644 --- a/cross-sparc64-gcc13.spec +++ b/cross-sparc64-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec index f22ec45..a9283ac 100644 --- a/cross-x86_64-gcc13.spec +++ b/cross-x86_64-gcc13.spec @@ -734,22 +734,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/gcc.spec.in b/gcc.spec.in index fb3186e..90a9229 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -1731,22 +1731,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec index 26d6519..48d5de1 100644 --- a/gcc13-testresults.spec +++ b/gcc13-testresults.spec @@ -922,22 +922,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \ diff --git a/gcc13.changes b/gcc13.changes index b037ac7..b73f8fa 100644 --- a/gcc13.changes +++ b/gcc13.changes @@ -8,6 +8,7 @@ Mon Aug 28 07:59:17 UTC 2023 - Richard Biener - Disable building newlib cross compilers on non-openSUSE code streams since newlib isn't available there. - Fix typo preventing s390x compiler build. +- Raise s390x architecture baseline to z14 for ALP. [PED-253] ------------------------------------------------------------------- Wed Aug 23 06:50:07 UTC 2023 - Richard Biener diff --git a/gcc13.spec b/gcc13.spec index 698838e..5f1079c 100644 --- a/gcc13.spec +++ b/gcc13.spec @@ -2739,22 +2739,9 @@ amdgcn-amdhsa,\ %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 \ +%if "%{TARGET_ARCH}" == "s390" || "%{TARGET_ARCH}" == "s390x" +%if %{suse_version} >= 1600 && !0{?is_opensuse} + --with-tune=z14 --with-arch=z14 \ %else %if %{suse_version} >= 1310 --with-tune=zEC12 --with-arch=z196 \