- Fix up nvptx offloading so that it actually works.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=22

cross-aarch64-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-aarch64-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-arm-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-arm-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-avr-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-avr-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-epiphany-gcc7-bootstrap.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-epiphany-gcc7-bootstrap.spec

@@ -30,7 +30,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -78,10 +78,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -122,6 +127,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -411,16 +417,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -578,7 +580,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -586,6 +588,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -643,10 +653,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-epiphany-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-epiphany-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-hppa-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-hppa-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-i386-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-i386-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-m68k-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-m68k-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-mips-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-mips-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-nvptx-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-nvptx-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-ppc64-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-ppc64-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-ppc64le-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-ppc64le-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-rx-gcc7-bootstrap.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-rx-gcc7-bootstrap.spec

@@ -30,7 +30,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -78,10 +78,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -122,6 +127,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -411,16 +417,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -578,7 +580,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -586,6 +588,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -643,10 +653,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-rx-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-rx-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-s390x-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-s390x-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-sparc-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-sparc-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-sparc64-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-sparc64-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  x86_64
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross-x86_64-gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

cross-x86_64-gcc7.spec

@@ -29,7 +29,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -77,10 +77,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -121,6 +126,7 @@ BuildRequires:  cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires:  nvptx-tools
+Requires:       nvptx-tools
 ExclusiveArch:  
 %define nvptx_newlib 1
 %endif
@@ -410,16 +416,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}
@@ -577,7 +579,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -585,6 +587,14 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
+
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
 # The assembler comes from the cross-binutils, and hence is _not_
@@ -642,10 +652,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

cross.spec.in

@@ -8,7 +8,7 @@
 # Please submit bugfixes or comments via http://www.suse.de/feedback/
 #
 
-%define build_cp 1
+%define build_cp 0%{!?gcc_accel:1}
 %define build_ada 0
 %define build_libjava 0
 %define build_java 0
@@ -56,10 +56,15 @@
 
 %if 0%{?gcc_icecream:1}
 %define build_sysroot /
+%define sysroot %{_prefix}/%{gcc_target_arch}
 %else
+# offloading builds newlib in-tree and can install in
+# the GCC private path without extra sysroot
+%if 0%{!?gcc_accel:1}
 # use same sysroot as in binutils.spec
 %define sysroot %{_prefix}/%{binutils_os}/sys-root
 %endif
+%endif
 
 %if %{suse_version} >= 1220
 %define selfconflict() %1
@@ -100,6 +105,7 @@ BuildRequires: cross-%cross_arch-glibc-devel
 %endif
 %if %{cross_arch} == "nvptx"
 BuildRequires: nvptx-tools
+Requires: nvptx-tools
 ExclusiveArch: x86_64
 %define nvptx_newlib 1
 %endif
@@ -168,7 +174,7 @@ export NO_DEBUGINFO_STRIP_DEBUG=true
 %define __debug_install_post %{nil}
 : >../debugfiles.list
 : >../debugsources.list
-make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
+make DESTDIR=$RPM_BUILD_ROOT/%{?sysroot:%sysroot} install-target
 %endif
 %endif
 
@@ -176,6 +182,13 @@ make DESTDIR=$RPM_BUILD_ROOT/%{sysroot} install-target
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 
+# for accelerators remove all frontends but lto1 and also install-tools
+%if 0%{?gcc_accel:1}
+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
+%endif
 
 %if 0%{?gcc_icecream:%gcc_icecream}
 # Build an icecream environment
@@ -234,10 +247,12 @@ rm -r env
 %dir %{targetlibsubdir}
 %dir %{_libdir}/gcc/%{gcc_target_arch}
 %{targetlibsubdir}
-
+%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap:1} && 0%{?sysroot:1}
-%if 0%{!?gcc_icecream:1} && 0%{!?gcc_libc_bootstrap: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

gcc.spec.in

@@ -1231,16 +1231,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}

gcc7-testresults.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

gcc7-testresults.spec

@@ -599,16 +599,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}

gcc7.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  2 13:44:56 UTC 2017 - rguenther@suse.com
+
+- Fix up nvptx offloading so that it actually works.
+
 -------------------------------------------------------------------
 Tue Jan 31 12:25:34 UTC 2017 - rguenther@suse.com
 

gcc7.spec

@@ -1923,16 +1923,12 @@ nvptx-none=%{_prefix}/nvptx-none, \
 	--disable-nls \
 %if 0%{?sysroot:1}
 	--with-sysroot=%sysroot \
-%else
-	--with-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %if 0%{?build_sysroot:1}
 	--with-build-sysroot=%{build_sysroot} \
 %else
 %if 0%{?sysroot:1}
 	--with-build-sysroot=%{sysroot} \
-%else
-	--with-build-sysroot=%{_prefix}/%{gcc_target_arch} \
 %endif
 %endif
 %if 0%{?binutils_os:1}