From 10f42a103091a1644a5f45324fad272ae7a064d37fce9374bb2c47af268def61 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 1 Mar 2018 13:09:00 +0000 Subject: [PATCH] - 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