From a59949e485b15c2d489c547b6d884e344e2ac6f152a2821947ed1cb2c2233b6b Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 1 Feb 2018 10:07:59 +0000 Subject: [PATCH 1/5] - Use %{?_smp_mflags} everywhere. - Update _constraints to bump physicalmemory and general simplification. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=112 --- _constraints | 23 +++-------------------- cross-aarch64-gcc7.changes | 6 ++++++ cross-aarch64-gcc7.spec | 20 ++------------------ cross-arm-gcc7.changes | 6 ++++++ cross-arm-gcc7.spec | 20 ++------------------ cross-avr-gcc7-bootstrap.changes | 6 ++++++ cross-avr-gcc7-bootstrap.spec | 20 ++------------------ cross-avr-gcc7.changes | 6 ++++++ cross-avr-gcc7.spec | 20 ++------------------ cross-epiphany-gcc7-bootstrap.changes | 6 ++++++ cross-epiphany-gcc7-bootstrap.spec | 20 ++------------------ cross-epiphany-gcc7.changes | 6 ++++++ cross-epiphany-gcc7.spec | 20 ++------------------ cross-hppa-gcc7.changes | 6 ++++++ cross-hppa-gcc7.spec | 20 ++------------------ cross-i386-gcc7.changes | 6 ++++++ cross-i386-gcc7.spec | 20 ++------------------ cross-m68k-gcc7.changes | 6 ++++++ cross-m68k-gcc7.spec | 20 ++------------------ cross-mips-gcc7.changes | 6 ++++++ cross-mips-gcc7.spec | 20 ++------------------ cross-nvptx-gcc7.changes | 6 ++++++ cross-nvptx-gcc7.spec | 20 ++------------------ cross-ppc64-gcc7.changes | 6 ++++++ cross-ppc64-gcc7.spec | 20 ++------------------ cross-ppc64le-gcc7.changes | 6 ++++++ cross-ppc64le-gcc7.spec | 20 ++------------------ cross-rx-gcc7-bootstrap.changes | 6 ++++++ cross-rx-gcc7-bootstrap.spec | 20 ++------------------ cross-rx-gcc7.changes | 6 ++++++ cross-rx-gcc7.spec | 20 ++------------------ cross-s390x-gcc7.changes | 6 ++++++ cross-s390x-gcc7.spec | 20 ++------------------ cross-sparc-gcc7.changes | 6 ++++++ cross-sparc-gcc7.spec | 20 ++------------------ cross-sparc64-gcc7.changes | 6 ++++++ cross-sparc64-gcc7.spec | 20 ++------------------ cross-x86_64-gcc7.changes | 6 ++++++ cross-x86_64-gcc7.spec | 20 ++------------------ cross.spec.in | 4 ++-- gcc.spec.in | 22 +++------------------- gcc7-testresults.changes | 6 ++++++ gcc7-testresults.spec | 22 +++------------------- gcc7.changes | 6 ++++++ gcc7.spec | 22 +++------------------- 45 files changed, 178 insertions(+), 421 deletions(-) diff --git a/_constraints b/_constraints index 573ba23..4a09b4d 100644 --- a/_constraints +++ b/_constraints @@ -3,26 +3,9 @@ 16 - - - - gcc7-testresults - - - 3 + 4 - - - - - gcc7 - - - 4 - - 2 - - - + 4 + diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 1484896..14b407c 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 4e9a332..44ef703 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index df45f04..968f1e5 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index 8bdb1ef..ada9024 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index bed9b4d..8c37b19 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index df45f04..968f1e5 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index ce18728..55ba7f4 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -317,22 +317,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -562,9 +546,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index 4aebe4c..1521c68 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index 3c1b9a1..88a1986 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index ba5f9ea..00ac381 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index b985030..7c6a564 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index f8a33f7..0d3654f 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index a44808c..6e876ff 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 3b211a8..875f960 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 3c3b174..3d06a27 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index df45f04..968f1e5 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index caa2a5d..c93e58b 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -317,22 +317,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -562,9 +546,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index bf225cd..fdd6f47 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index 07f3d3b..ed3fdca 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 8614a70..a0b7559 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 233b1be..4e7e537 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index df45f04..968f1e5 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index d10af7a..7f47a87 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -316,22 +316,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -561,9 +545,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ --host=%{GCCDIST} %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif %if 0%{?gcc_icecream:%gcc_icecream} diff --git a/cross.spec.in b/cross.spec.in index 2a2a843..1bd5213 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -139,9 +139,9 @@ Requires(preun): update-alternatives # COMMON-END %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %else -make %{?jobs:-j%jobs} all-host +make %{?_smp_mflags} all-host %endif diff --git a/gcc.spec.in b/gcc.spec.in index bcdc0b1..1d7f08e 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -1118,22 +1118,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -1367,9 +1351,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ STAGE1_FLAGS="-g -O2" # Only run profiled bootstrap on archs where it works and matters %ifarch x86_64 %ix86 ppc64le s390x aarch64 -make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %else -make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %endif make info %if 0%{?run_tests:1} @@ -1379,7 +1363,7 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.log %{GCCDIST}/libstdc++-v3/tests mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum # asan needs a whole shadow address space ulimit -v unlimited || true -make -k check $PARALLEL || true +make -k check %{?_smp_mflags} || true mkdir ../testresults ../contrib/test_summary | tee ../testresults/test_summary.txt %endif diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index df45f04..968f1e5 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index 7e87717..1c174a4 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -504,22 +504,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -751,9 +735,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ STAGE1_FLAGS="-g -O2" # Only run profiled bootstrap on archs where it works and matters %ifarch x86_64 %ix86 ppc64le s390x aarch64 -make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %else -make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %endif make info %if 0%{?run_tests:1} @@ -763,7 +747,7 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.log %{GCCDIST}/libstdc++-v3/tests mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum # asan needs a whole shadow address space ulimit -v unlimited || true -make -k check $PARALLEL || true +make -k check %{?_smp_mflags} || true mkdir ../testresults ../contrib/test_summary | tee ../testresults/test_summary.txt %endif diff --git a/gcc7.changes b/gcc7.changes index df45f04..968f1e5 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com + +- Use %{?_smp_mflags} everywhere. +- Update _constraints to bump physicalmemory and general simplification. + ------------------------------------------------------------------- Thu Jan 25 09:46:10 UTC 2018 - rguenther@suse.com diff --git a/gcc7.spec b/gcc7.spec index eefc546..34a8f5d 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -1808,22 +1808,6 @@ languages=$languages,ada languages=$languages,go %endif -J=%{?jobs:%jobs} -if test -z "$J"; then - J=$(getconf _NPROCESSORS_CONF) - JL=$(($J * 2)) -else - test 1 -gt "$J" && J=1 - JL=$(($(getconf _NPROCESSORS_CONF)*2)) -fi -if test "$J" == "0"; then - J=1 -fi -if test "$JL" == "0"; then - JL=1 -fi -PARALLEL="-j$J -l$JL" - # In general we want to ship release checking enabled compilers # which is the default for released compilers #ENABLE_CHECKING="--enable-checking=yes" @@ -2055,9 +2039,9 @@ nvptx-none=%{_prefix}/nvptx-none, \ STAGE1_FLAGS="-g -O2" # Only run profiled bootstrap on archs where it works and matters %ifarch x86_64 %ix86 ppc64le s390x aarch64 -make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %else -make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} %endif make info %if 0%{?run_tests:1} @@ -2067,7 +2051,7 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.log %{GCCDIST}/libstdc++-v3/tests mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum # asan needs a whole shadow address space ulimit -v unlimited || true -make -k check $PARALLEL || true +make -k check %{?_smp_mflags} || true mkdir ../testresults ../contrib/test_summary | tee ../testresults/test_summary.txt %endif From 4a3c33f929008f168868996c276fb2ce8c19d31b5fe4c1c9340a0132d2066c94 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 26 Feb 2018 09:09:18 +0000 Subject: [PATCH 2/5] - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=113 --- cross-aarch64-gcc7.changes | 7 +++++++ cross-aarch64-gcc7.spec | 8 +++++++- cross-arm-gcc7.changes | 7 +++++++ cross-arm-gcc7.spec | 8 +++++++- cross-avr-gcc7-bootstrap.changes | 7 +++++++ cross-avr-gcc7-bootstrap.spec | 8 +++++++- cross-avr-gcc7.changes | 7 +++++++ cross-avr-gcc7.spec | 8 +++++++- cross-epiphany-gcc7-bootstrap.changes | 7 +++++++ cross-epiphany-gcc7-bootstrap.spec | 8 +++++++- cross-epiphany-gcc7.changes | 7 +++++++ cross-epiphany-gcc7.spec | 8 +++++++- cross-hppa-gcc7.changes | 7 +++++++ cross-hppa-gcc7.spec | 8 +++++++- cross-i386-gcc7.changes | 7 +++++++ cross-i386-gcc7.spec | 8 +++++++- cross-m68k-gcc7.changes | 7 +++++++ cross-m68k-gcc7.spec | 8 +++++++- cross-mips-gcc7.changes | 7 +++++++ cross-mips-gcc7.spec | 8 +++++++- cross-nvptx-gcc7.changes | 7 +++++++ cross-nvptx-gcc7.spec | 8 +++++++- cross-ppc64-gcc7.changes | 7 +++++++ cross-ppc64-gcc7.spec | 8 +++++++- cross-ppc64le-gcc7.changes | 7 +++++++ cross-ppc64le-gcc7.spec | 8 +++++++- cross-rx-gcc7-bootstrap.changes | 7 +++++++ cross-rx-gcc7-bootstrap.spec | 8 +++++++- cross-rx-gcc7.changes | 7 +++++++ cross-rx-gcc7.spec | 8 +++++++- cross-s390x-gcc7.changes | 7 +++++++ cross-s390x-gcc7.spec | 8 +++++++- cross-sparc-gcc7.changes | 7 +++++++ cross-sparc-gcc7.spec | 8 +++++++- cross-sparc64-gcc7.changes | 7 +++++++ cross-sparc64-gcc7.spec | 8 +++++++- cross-x86_64-gcc7.changes | 7 +++++++ cross-x86_64-gcc7.spec | 8 +++++++- cross.spec.in | 6 ++++++ gcc-7.3.0+r257042.tar.xz | 3 --- gcc-7.3.1+r257981.tar.xz | 3 +++ gcc.spec.in | 2 +- gcc7-testresults.changes | 7 +++++++ gcc7-testresults.spec | 2 +- gcc7.changes | 7 +++++++ gcc7.spec | 2 +- 46 files changed, 292 insertions(+), 25 deletions(-) delete mode 100644 gcc-7.3.0+r257042.tar.xz create mode 100644 gcc-7.3.1+r257981.tar.xz diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 14b407c..34c52a1 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 44ef703..72e1e22 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index 968f1e5..a68afb8 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index ada9024..df63349 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index 8c37b19..e1c1bd1 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index 968f1e5..a68afb8 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index 55ba7f4..47888fe 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -152,6 +152,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -160,7 +166,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index 1521c68..00ccad6 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index 88a1986..f139b0a 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index 00ac381..7b9e94a 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index 7c6a564..a50e2a0 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index 0d3654f..828cd5f 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index 6e876ff..1ef32c1 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 875f960..46f5caa 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 3d06a27..b9138aa 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index 968f1e5..a68afb8 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index c93e58b..263fc60 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -152,6 +152,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -160,7 +166,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index fdd6f47..9059fb9 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index ed3fdca..ffdab36 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index a0b7559..fc0bb66 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 4e7e537..f736f1c 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index 968f1e5..a68afb8 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index 7f47a87..bb2bbdc 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -151,6 +151,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc7 +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives @@ -159,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross.spec.in b/cross.spec.in index 1bd5213..6cc432a 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -130,6 +130,12 @@ Obsoletes: cross-ppc-gcc49 <= 4.9.0+r209354 Provides: %{gcc_target_arch}-gcc Conflicts: %selfconflict %{gcc_target_arch}-gcc %endif +%if 0%{?gcc_libc_bootstrap:1} +# The -bootstrap packages file-conflict with the non-bootstrap variants. +# Even if we don't actually (want to) distribute the bootstrap variants +# the following avoids repo-checker spamming us endlessly. +Conflicts: cross-%{cross_arch}-gcc@base_ver@ +%endif #!BuildIgnore: gcc-PIE BuildRequires: update-alternatives Requires(post): update-alternatives diff --git a/gcc-7.3.0+r257042.tar.xz b/gcc-7.3.0+r257042.tar.xz deleted file mode 100644 index 5a0bd2f..0000000 --- a/gcc-7.3.0+r257042.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:572ed62e44657e3b8b991478f899a44d75e682d610c853987df144fad30c1c1b -size 61106792 diff --git a/gcc-7.3.1+r257981.tar.xz b/gcc-7.3.1+r257981.tar.xz new file mode 100644 index 0000000..5b9fc94 --- /dev/null +++ b/gcc-7.3.1+r257981.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85dd3c787926c228924010cf04e6bdc735761e080871c30884834739c335bfad +size 61158976 diff --git a/gcc.spec.in b/gcc.spec.in index 1d7f08e..4a996b4 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -239,7 +239,7 @@ BuildRequires: gdb %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 1 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index 968f1e5..a68afb8 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index 1c174a4..951424a 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -253,7 +253,7 @@ BuildRequires: gdb %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/gcc7.changes b/gcc7.changes index 968f1e5..a68afb8 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com + +- Update to gcc-7-branch head (r257981). +- Add conflicts to non-bootstrap variant for cross packages to silence + repo-checker. + ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/gcc7.spec b/gcc7.spec index 34a8f5d..f0ad91d 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -235,7 +235,7 @@ BuildRequires: gdb %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.0+r257042 +Version: 7.3.1+r257981 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) From dfe52d5e646d2c1aadf7c2341f23f4e3373129a58004fade6efb841f00d84a8d Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 26 Feb 2018 11:14:50 +0000 Subject: [PATCH 3/5] - Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=114 --- cross-aarch64-gcc7.changes | 1 + cross-arm-gcc7.changes | 1 + cross-avr-gcc7-bootstrap.changes | 1 + cross-avr-gcc7.changes | 1 + cross-epiphany-gcc7-bootstrap.changes | 1 + cross-epiphany-gcc7.changes | 1 + cross-hppa-gcc7.changes | 1 + cross-i386-gcc7.changes | 1 + cross-m68k-gcc7.changes | 1 + cross-mips-gcc7.changes | 1 + cross-nvptx-gcc7.changes | 1 + cross-ppc64-gcc7.changes | 1 + cross-ppc64le-gcc7.changes | 1 + cross-rx-gcc7-bootstrap.changes | 1 + cross-rx-gcc7.changes | 1 + cross-s390x-gcc7.changes | 1 + cross-sparc-gcc7.changes | 1 + cross-sparc64-gcc7.changes | 1 + cross-x86_64-gcc7.changes | 1 + gcc48-remove-mpfr-2.4.0-requirement.patch | 139 ++++++++++++++++++++++ gcc7-testresults.changes | 1 + gcc7.changes | 1 + 22 files changed, 160 insertions(+) diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index a68afb8..0c44b16 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index a68afb8..0c44b16 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index a68afb8..0c44b16 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index a68afb8..0c44b16 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/gcc48-remove-mpfr-2.4.0-requirement.patch b/gcc48-remove-mpfr-2.4.0-requirement.patch index 0e513a5..b5eb04f 100644 --- a/gcc48-remove-mpfr-2.4.0-requirement.patch +++ b/gcc48-remove-mpfr-2.4.0-requirement.patch @@ -106,3 +106,142 @@ Index: gcc/ubsan.c else return NULL_TREE; +Index: gcc/gimple-ssa-sprintf.c +=================================================================== +--- gcc/gimple-ssa-sprintf.c (revision 257728) ++++ gcc/gimple-ssa-sprintf.c (working copy) +@@ -1637,18 +1637,7 @@ get_mpfr_format_length (mpfr_ptr x, cons + p = 1024; + } + +- len = mpfr_snprintf (NULL, 0, fmtstr, (int)p, x); +- +- /* Handle the unlikely (impossible?) error by returning more than +- the maximum dictated by the function's return type. */ +- if (len < 0) +- return target_dir_max () + 1; +- +- /* Adjust the return value by the difference. */ +- if (p < prec) +- len += prec - p; +- +- return len; ++ return target_dir_max () + 1; + } + + /* Return the number of bytes to format using the format specifier + +Index: gcc/fortran/simplify.c +=================================================================== +--- gcc/fortran/simplify.c (revision 257983) ++++ gcc/fortran/simplify.c (working copy) +@@ -1745,51 +1745,6 @@ simplify_trig_call (gfc_expr *icall) + } + } + +-/* Convert a floating-point number from radians to degrees. */ +- +-static void +-degrees_f (mpfr_t x, mp_rnd_t rnd_mode) +-{ +- mpfr_t tmp; +- mpfr_init (tmp); +- +- /* Set x = x % 2pi to avoid offsets with large angles. */ +- mpfr_const_pi (tmp, rnd_mode); +- mpfr_mul_ui (tmp, tmp, 2, rnd_mode); +- mpfr_fmod (tmp, x, tmp, rnd_mode); +- +- /* Set x = x * 180. */ +- mpfr_mul_ui (x, x, 180, rnd_mode); +- +- /* Set x = x / pi. */ +- mpfr_const_pi (tmp, rnd_mode); +- mpfr_div (x, x, tmp, rnd_mode); +- +- mpfr_clear (tmp); +-} +- +-/* Convert a floating-point number from degrees to radians. */ +- +-static void +-radians_f (mpfr_t x, mp_rnd_t rnd_mode) +-{ +- mpfr_t tmp; +- mpfr_init (tmp); +- +- /* Set x = x % 360 to avoid offsets with large angles. */ +- mpfr_set_ui (tmp, 360, rnd_mode); +- mpfr_fmod (tmp, x, tmp, rnd_mode); +- +- /* Set x = x * pi. */ +- mpfr_const_pi (tmp, rnd_mode); +- mpfr_mul (x, x, tmp, rnd_mode); +- +- /* Set x = x / 180. */ +- mpfr_div_ui (x, x, 180, rnd_mode); +- +- mpfr_clear (tmp); +-} +- + + /* Convert argument to radians before calling a trig function. */ + +@@ -1803,12 +1758,7 @@ gfc_simplify_trigd (gfc_expr *icall) + if (arg->ts.type != BT_REAL) + gfc_internal_error ("in gfc_simplify_trigd(): Bad type"); + +- if (arg->expr_type == EXPR_CONSTANT) +- /* Convert constant to radians before passing off to simplifier. */ +- radians_f (arg->value.real, GFC_RND_MODE); +- +- /* Let the usual simplifier take over - we just simplified the arg. */ +- return simplify_trig_call (icall); ++ return NULL; + } + + /* Convert result of an inverse trig function to degrees. */ +@@ -1816,21 +1766,9 @@ gfc_simplify_trigd (gfc_expr *icall) + gfc_expr * + gfc_simplify_atrigd (gfc_expr *icall) + { +- gfc_expr *result; +- + if (icall->value.function.actual->expr->ts.type != BT_REAL) + gfc_internal_error ("in gfc_simplify_atrigd(): Bad type"); + +- /* See if another simplifier has work to do first. */ +- result = simplify_trig_call (icall); +- +- if (result && result->expr_type == EXPR_CONSTANT) +- { +- /* Convert constant to degrees after passing off to actual simplifier. */ +- degrees_f (result->value.real, GFC_RND_MODE); +- return result; +- } +- + /* Let gfc_resolve_atrigd take care of the non-constant case. */ + return NULL; + } +@@ -1840,21 +1778,9 @@ gfc_simplify_atrigd (gfc_expr *icall) + gfc_expr * + gfc_simplify_atan2d (gfc_expr *y, gfc_expr *x) + { +- gfc_expr *result; +- + if (x->ts.type != BT_REAL || y->ts.type != BT_REAL) + gfc_internal_error ("in gfc_simplify_atan2d(): Bad type"); + +- if (x->expr_type == EXPR_CONSTANT && y->expr_type == EXPR_CONSTANT) +- { +- result = gfc_simplify_atan2 (y, x); +- if (result != NULL) +- { +- degrees_f (result->value.real, GFC_RND_MODE); +- return result; +- } +- } +- + /* Let gfc_resolve_atan2d take care of the non-constant case. */ + return NULL; + } diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index a68afb8..0c44b16 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com diff --git a/gcc7.changes b/gcc7.changes index a68afb8..0c44b16 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -4,6 +4,7 @@ Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com - Update to gcc-7-branch head (r257981). - Add conflicts to non-bootstrap variant for cross packages to silence repo-checker. +- Amend gcc48-remove-mpfr-2.4.0-requirement.patch to fix build on SLE11. ------------------------------------------------------------------- Thu Feb 1 09:26:51 UTC 2018 - rguenther@suse.com From 71f5236cbd623f1071a3264386556e8b6412ef9c087cc2f186f15fb5ede65390 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 28 Feb 2018 09:44:47 +0000 Subject: [PATCH 4/5] Accepting request 580893 from home:marxin:gcc7-branch - Update to gcc-7-branch head (r258025). OBS-URL: https://build.opensuse.org/request/show/580893 OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=115 --- cross-aarch64-gcc7.changes | 5 +++++ cross-aarch64-gcc7.spec | 2 +- cross-arm-gcc7.changes | 5 +++++ cross-arm-gcc7.spec | 2 +- cross-avr-gcc7-bootstrap.changes | 5 +++++ cross-avr-gcc7-bootstrap.spec | 2 +- cross-avr-gcc7.changes | 5 +++++ cross-avr-gcc7.spec | 2 +- cross-epiphany-gcc7-bootstrap.changes | 5 +++++ cross-epiphany-gcc7-bootstrap.spec | 2 +- cross-epiphany-gcc7.changes | 5 +++++ cross-epiphany-gcc7.spec | 2 +- cross-hppa-gcc7.changes | 5 +++++ cross-hppa-gcc7.spec | 2 +- cross-i386-gcc7.changes | 5 +++++ cross-i386-gcc7.spec | 2 +- cross-m68k-gcc7.changes | 5 +++++ cross-m68k-gcc7.spec | 2 +- cross-mips-gcc7.changes | 5 +++++ cross-mips-gcc7.spec | 2 +- cross-nvptx-gcc7.changes | 5 +++++ cross-nvptx-gcc7.spec | 2 +- cross-ppc64-gcc7.changes | 5 +++++ cross-ppc64-gcc7.spec | 2 +- cross-ppc64le-gcc7.changes | 5 +++++ cross-ppc64le-gcc7.spec | 2 +- cross-rx-gcc7-bootstrap.changes | 5 +++++ cross-rx-gcc7-bootstrap.spec | 2 +- cross-rx-gcc7.changes | 5 +++++ cross-rx-gcc7.spec | 2 +- cross-s390x-gcc7.changes | 5 +++++ cross-s390x-gcc7.spec | 2 +- cross-sparc-gcc7.changes | 5 +++++ cross-sparc-gcc7.spec | 2 +- cross-sparc64-gcc7.changes | 5 +++++ cross-sparc64-gcc7.spec | 2 +- cross-x86_64-gcc7.changes | 5 +++++ cross-x86_64-gcc7.spec | 2 +- gcc-7.3.1+r257981.tar.xz | 3 --- gcc-7.3.1+r258025.tar.xz | 3 +++ gcc.spec.in | 2 +- gcc7-testresults.changes | 5 +++++ gcc7-testresults.spec | 2 +- gcc7.changes | 5 +++++ gcc7.spec | 2 +- 45 files changed, 130 insertions(+), 25 deletions(-) delete mode 100644 gcc-7.3.1+r257981.tar.xz create mode 100644 gcc-7.3.1+r258025.tar.xz diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index 34c52a1..f529a5e 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 72e1e22..6818c6b 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index 0c44b16..94dbd9f 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index df63349..1af8007 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index e1c1bd1..fe66da2 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index 0c44b16..94dbd9f 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index 47888fe..3d0fed4 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -166,7 +166,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index 00ccad6..25643d2 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index f139b0a..482f6c7 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index 7b9e94a..8c77075 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index a50e2a0..cdc45a3 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index 828cd5f..670a9dc 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index 1ef32c1..4c2f98f 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 46f5caa..e846fa9 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index b9138aa..5dda4c0 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index 0c44b16..94dbd9f 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index 263fc60..9a7aede 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -166,7 +166,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index 9059fb9..7eeced8 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index ffdab36..45113d9 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index fc0bb66..7741d5f 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index f736f1c..6f39c48 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index 0c44b16..94dbd9f 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index bb2bbdc..e9ba30f 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -165,7 +165,7 @@ Requires(preun): update-alternatives %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/gcc-7.3.1+r257981.tar.xz b/gcc-7.3.1+r257981.tar.xz deleted file mode 100644 index 5b9fc94..0000000 --- a/gcc-7.3.1+r257981.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85dd3c787926c228924010cf04e6bdc735761e080871c30884834739c335bfad -size 61158976 diff --git a/gcc-7.3.1+r258025.tar.xz b/gcc-7.3.1+r258025.tar.xz new file mode 100644 index 0000000..d4abb8b --- /dev/null +++ b/gcc-7.3.1+r258025.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3de8e7f80f71a38a87e9d4b2ceae55d4cce0e2472ac13a5c559cdb7d44a77efb +size 59650400 diff --git a/gcc.spec.in b/gcc.spec.in index 4a996b4..a685e46 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -239,7 +239,7 @@ BuildRequires: gdb %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 1 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index 0c44b16..94dbd9f 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index 951424a..73a0667 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -253,7 +253,7 @@ BuildRequires: gdb %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) diff --git a/gcc7.changes b/gcc7.changes index 0c44b16..94dbd9f 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz + +- Update to gcc-7-branch head (r258025). + ------------------------------------------------------------------- Mon Feb 26 09:02:16 UTC 2018 - rguenther@suse.com diff --git a/gcc7.spec b/gcc7.spec index f0ad91d..db693a2 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -235,7 +235,7 @@ BuildRequires: gdb %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 7.3.1+r257981 +Version: 7.3.1+r258025 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) From 10f42a103091a1644a5f45324fad272ae7a064d37fce9374bb2c47af268def61 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 1 Mar 2018 13:09:00 +0000 Subject: [PATCH 5/5] - Fix nvptx offload target compiler install so GCC can pick up required files. Split out the newlib part into cross-nvptx-newlib7-devel and avoid conflicts with GCC 8 variant via Provides/Conflicts of cross-nvptx-newlib-devel. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=116 --- cross-aarch64-gcc7.changes | 8 ++++++++ cross-aarch64-gcc7.spec | 27 ++++++++++++++++++++++---- cross-arm-gcc7.changes | 8 ++++++++ cross-arm-gcc7.spec | 27 ++++++++++++++++++++++---- cross-avr-gcc7-bootstrap.changes | 8 ++++++++ cross-avr-gcc7-bootstrap.spec | 27 ++++++++++++++++++++++---- cross-avr-gcc7.changes | 8 ++++++++ cross-avr-gcc7.spec | 27 ++++++++++++++++++++++---- cross-epiphany-gcc7-bootstrap.changes | 8 ++++++++ cross-epiphany-gcc7-bootstrap.spec | 27 ++++++++++++++++++++++---- cross-epiphany-gcc7.changes | 8 ++++++++ cross-epiphany-gcc7.spec | 27 ++++++++++++++++++++++---- cross-hppa-gcc7.changes | 8 ++++++++ cross-hppa-gcc7.spec | 27 ++++++++++++++++++++++---- cross-i386-gcc7.changes | 8 ++++++++ cross-i386-gcc7.spec | 27 ++++++++++++++++++++++---- cross-m68k-gcc7.changes | 8 ++++++++ cross-m68k-gcc7.spec | 27 ++++++++++++++++++++++---- cross-mips-gcc7.changes | 8 ++++++++ cross-mips-gcc7.spec | 27 ++++++++++++++++++++++---- cross-nvptx-gcc7.changes | 8 ++++++++ cross-nvptx-gcc7.spec | 27 ++++++++++++++++++++++---- cross-ppc64-gcc7.changes | 8 ++++++++ cross-ppc64-gcc7.spec | 27 ++++++++++++++++++++++---- cross-ppc64le-gcc7.changes | 8 ++++++++ cross-ppc64le-gcc7.spec | 27 ++++++++++++++++++++++---- cross-rx-gcc7-bootstrap.changes | 8 ++++++++ cross-rx-gcc7-bootstrap.spec | 27 ++++++++++++++++++++++---- cross-rx-gcc7.changes | 8 ++++++++ cross-rx-gcc7.spec | 27 ++++++++++++++++++++++---- cross-s390x-gcc7.changes | 8 ++++++++ cross-s390x-gcc7.spec | 27 ++++++++++++++++++++++---- cross-sparc-gcc7.changes | 8 ++++++++ cross-sparc-gcc7.spec | 27 ++++++++++++++++++++++---- cross-sparc64-gcc7.changes | 8 ++++++++ cross-sparc64-gcc7.spec | 27 ++++++++++++++++++++++---- cross-x86_64-gcc7.changes | 8 ++++++++ cross-x86_64-gcc7.spec | 27 ++++++++++++++++++++++---- cross.spec.in | 28 +++++++++++++++++++++++---- gcc7-testresults.changes | 8 ++++++++ gcc7.changes | 8 ++++++++ 41 files changed, 629 insertions(+), 80 deletions(-) diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index f529a5e..c19e6cb 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 6818c6b..117ea80 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-avr-gcc7-bootstrap.changes b/cross-avr-gcc7-bootstrap.changes index 94dbd9f..0df4ea7 100644 --- a/cross-avr-gcc7-bootstrap.changes +++ b/cross-avr-gcc7-bootstrap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-avr-gcc7-bootstrap.spec b/cross-avr-gcc7-bootstrap.spec index 1af8007..cac8daf 100644 --- a/cross-avr-gcc7-bootstrap.spec +++ b/cross-avr-gcc7-bootstrap.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index fe66da2..8f26f29 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index 94dbd9f..0df4ea7 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index 3d0fed4..08e4e20 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -132,6 +132,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -566,6 +567,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -625,6 +637,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -751,16 +767,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -768,4 +781,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index 25643d2..fe99a9a 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index 482f6c7..d8c3952 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index 8c77075..9ab4e10 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index cdc45a3..28c5036 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index 670a9dc..a6353c9 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-nvptx-gcc7.changes b/cross-nvptx-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-nvptx-gcc7.changes +++ b/cross-nvptx-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-nvptx-gcc7.spec b/cross-nvptx-gcc7.spec index 4c2f98f..ee48faf 100644 --- a/cross-nvptx-gcc7.spec +++ b/cross-nvptx-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index e846fa9..92fce39 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 5dda4c0..08cd739 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index 94dbd9f..0df4ea7 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index 9a7aede..04068b5 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -132,6 +132,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -566,6 +567,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -625,6 +637,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -751,16 +767,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -768,4 +781,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index 7eeced8..078ed5d 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index 45113d9..a4b4445 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 7741d5f..610db9a 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 6f39c48..b884667 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: x86_64 %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index e9ba30f..a36a3e1 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -131,6 +131,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %endif %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} Requires: nvptx-tools ExclusiveArch: %define nvptx_newlib 1 @@ -565,6 +566,17 @@ Group: Development/Languages/C and C++ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib7-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib7-devel +Newlib development files for the nvptx offload target compiler. +%endif + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -624,6 +636,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -750,16 +766,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc7-icecream-backend @@ -767,4 +780,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib7-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog diff --git a/cross.spec.in b/cross.spec.in index 6cc432a..99a4821 100644 --- a/cross.spec.in +++ b/cross.spec.in @@ -111,6 +111,7 @@ BuildRequires: cross-%cross_arch-glibc-devel %if %{cross_arch} == "nvptx" BuildRequires: nvptx-tools Requires: nvptx-tools +Requires: cross-nvptx-newlib-devel >= %{version}-%{release} ExclusiveArch: x86_64 %define nvptx_newlib 1 %endif @@ -161,6 +162,18 @@ This package contains the icecream environment for the GNU C Compiler %endif +%if 0%{?nvptx_newlib:1} +%package -n cross-nvptx-newlib@base_ver@-devel +Summary: newlib for the nvptx offload target +Group: Development/Languages/C and C++ +Provides: cross-nvptx-newlib-devel = %{version}-%{release} +Conflicts: cross-nvptx-newlib-devel + +%description -n cross-nvptx-newlib@base_ver@-devel +Newlib development files for the nvptx offload target compiler. +%endif + + %define targetlibsubdir %{_libdir}/gcc/%{gcc_target_arch}/%{gcc_dir_version} %install @@ -221,6 +234,10 @@ rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1 rm -f $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/cc1plus rm -rf $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch}/install-tools rm -rf $RPM_BUILD_ROOT%{targetlibsubdir}/install-tools +# also move things from target directories into the accel path since +# that is the place where we later search for (only) +( cd $RPM_BUILD_ROOT%{targetlibsubdir} && tar cf - . ) | ( cd $RPM_BUILD_ROOT%{libsubdir}/accel/%{gcc_target_arch} && tar xf - ) +rm -rf $RPM_BUILD_ROOT%{targetlibsubdir} %endif %if 0%{?gcc_icecream:%gcc_icecream} @@ -347,16 +364,13 @@ fi %endif %endif %endif -%endif %dir %{targetlibsubdir} %dir %{_libdir}/gcc/%{gcc_target_arch} %{targetlibsubdir} +%endif %if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1} %{sysroot} %endif -%if 0%{?nvptx_newlib:1} -%{_prefix}/%{gcc_target_arch} -%endif %if 0%{?gcc_icecream:%gcc_icecream} %files -n cross-%cross_arch-gcc@base_ver@-icecream-backend @@ -364,4 +378,10 @@ fi /usr/share/icecream-envs %endif +%if 0%{?nvptx_newlib:1} +%files -n cross-nvptx-newlib@base_ver@-devel +%defattr(-,root,root) +%{_prefix}/%{gcc_target_arch} +%endif + %changelog -n cross-%{pkgname}-gcc@base_ver@ diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index 94dbd9f..0df4ea7 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz diff --git a/gcc7.changes b/gcc7.changes index 94dbd9f..0df4ea7 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Mar 1 13:03:25 UTC 2018 - rguenther@suse.com + +- Fix nvptx offload target compiler install so GCC can pick up + required files. Split out the newlib part into cross-nvptx-newlib7-devel + and avoid conflicts with GCC 8 variant via Provides/Conflicts + of cross-nvptx-newlib-devel. + ------------------------------------------------------------------- Tue Feb 27 08:37:14 UTC 2018 - mliska@suse.cz