From 9f928ad94e77898787657c4b3ffa45ac53f7bee446a59d1154920dbbaf629cb4 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Fri, 20 Jan 2017 11:59:41 +0000 Subject: [PATCH] - Enable offloading for nvptx-none on the host (offload compiler still missing). Re-enable HSA offloading. OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc7?expand=0&rev=10 --- cross-aarch64-gcc7.changes | 3 ++- cross-aarch64-gcc7.spec | 9 +++++++-- cross-arm-gcc7.changes | 3 ++- cross-arm-gcc7.spec | 9 +++++++-- cross-avr-gcc7.changes | 3 ++- cross-avr-gcc7.spec | 9 +++++++-- cross-epiphany-gcc7-bootstrap.changes | 3 ++- cross-epiphany-gcc7-bootstrap.spec | 9 +++++++-- cross-epiphany-gcc7.changes | 3 ++- cross-epiphany-gcc7.spec | 9 +++++++-- cross-hppa-gcc7.changes | 3 ++- cross-hppa-gcc7.spec | 9 +++++++-- cross-i386-gcc7.changes | 3 ++- cross-i386-gcc7.spec | 9 +++++++-- cross-m68k-gcc7.changes | 3 ++- cross-m68k-gcc7.spec | 9 +++++++-- cross-mips-gcc7.changes | 3 ++- cross-mips-gcc7.spec | 9 +++++++-- cross-ppc64-gcc7.changes | 3 ++- cross-ppc64-gcc7.spec | 9 +++++++-- cross-ppc64le-gcc7.changes | 3 ++- cross-ppc64le-gcc7.spec | 9 +++++++-- cross-rx-gcc7-bootstrap.changes | 3 ++- cross-rx-gcc7-bootstrap.spec | 9 +++++++-- cross-rx-gcc7.changes | 3 ++- cross-rx-gcc7.spec | 9 +++++++-- cross-s390x-gcc7.changes | 3 ++- cross-s390x-gcc7.spec | 9 +++++++-- cross-sparc-gcc7.changes | 3 ++- cross-sparc-gcc7.spec | 9 +++++++-- cross-sparc64-gcc7.changes | 3 ++- cross-sparc64-gcc7.spec | 9 +++++++-- cross-x86_64-gcc7.changes | 3 ++- cross-x86_64-gcc7.spec | 9 +++++++-- gcc.spec.in | 19 ++++++++++--------- gcc7-testresults.changes | 3 ++- gcc7-testresults.spec | 13 +++++++------ gcc7.changes | 3 ++- gcc7.spec | 19 ++++++++++--------- 39 files changed, 184 insertions(+), 77 deletions(-) diff --git a/cross-aarch64-gcc7.changes b/cross-aarch64-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-aarch64-gcc7.changes +++ b/cross-aarch64-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-aarch64-gcc7.spec b/cross-aarch64-gcc7.spec index c2a9e5b..6048c28 100644 --- a/cross-aarch64-gcc7.spec +++ b/cross-aarch64-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-arm-gcc7.changes b/cross-arm-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-arm-gcc7.changes +++ b/cross-arm-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-arm-gcc7.spec b/cross-arm-gcc7.spec index 5b7c29e..3555ac4 100644 --- a/cross-arm-gcc7.spec +++ b/cross-arm-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-avr-gcc7.changes b/cross-avr-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-avr-gcc7.changes +++ b/cross-avr-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-avr-gcc7.spec b/cross-avr-gcc7.spec index 09a2ed5..bb133a3 100644 --- a/cross-avr-gcc7.spec +++ b/cross-avr-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-epiphany-gcc7-bootstrap.changes b/cross-epiphany-gcc7-bootstrap.changes index d3c6bfb..f174631 100644 --- a/cross-epiphany-gcc7-bootstrap.changes +++ b/cross-epiphany-gcc7-bootstrap.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-epiphany-gcc7-bootstrap.spec b/cross-epiphany-gcc7-bootstrap.spec index ab52450..eb68dc5 100644 --- a/cross-epiphany-gcc7-bootstrap.spec +++ b/cross-epiphany-gcc7-bootstrap.spec @@ -366,11 +366,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-epiphany-gcc7.changes b/cross-epiphany-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-epiphany-gcc7.changes +++ b/cross-epiphany-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-epiphany-gcc7.spec b/cross-epiphany-gcc7.spec index eb46815..ca45f7c 100644 --- a/cross-epiphany-gcc7.spec +++ b/cross-epiphany-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-hppa-gcc7.changes b/cross-hppa-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-hppa-gcc7.changes +++ b/cross-hppa-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-hppa-gcc7.spec b/cross-hppa-gcc7.spec index c3a8602..09fbc23 100644 --- a/cross-hppa-gcc7.spec +++ b/cross-hppa-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-i386-gcc7.changes b/cross-i386-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-i386-gcc7.changes +++ b/cross-i386-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-i386-gcc7.spec b/cross-i386-gcc7.spec index fc949c7..2bb8aa4 100644 --- a/cross-i386-gcc7.spec +++ b/cross-i386-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-m68k-gcc7.changes b/cross-m68k-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-m68k-gcc7.changes +++ b/cross-m68k-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-m68k-gcc7.spec b/cross-m68k-gcc7.spec index f3f044b..6951223 100644 --- a/cross-m68k-gcc7.spec +++ b/cross-m68k-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-mips-gcc7.changes b/cross-mips-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-mips-gcc7.changes +++ b/cross-mips-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-mips-gcc7.spec b/cross-mips-gcc7.spec index c363bac..528f939 100644 --- a/cross-mips-gcc7.spec +++ b/cross-mips-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-ppc64-gcc7.changes b/cross-ppc64-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-ppc64-gcc7.changes +++ b/cross-ppc64-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-ppc64-gcc7.spec b/cross-ppc64-gcc7.spec index 5b60b74..7dd88d0 100644 --- a/cross-ppc64-gcc7.spec +++ b/cross-ppc64-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-ppc64le-gcc7.changes b/cross-ppc64le-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-ppc64le-gcc7.changes +++ b/cross-ppc64le-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-ppc64le-gcc7.spec b/cross-ppc64le-gcc7.spec index 4a84c70..fda4c93 100644 --- a/cross-ppc64le-gcc7.spec +++ b/cross-ppc64le-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-rx-gcc7-bootstrap.changes b/cross-rx-gcc7-bootstrap.changes index d3c6bfb..f174631 100644 --- a/cross-rx-gcc7-bootstrap.changes +++ b/cross-rx-gcc7-bootstrap.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-rx-gcc7-bootstrap.spec b/cross-rx-gcc7-bootstrap.spec index 7e17727..35d4a03 100644 --- a/cross-rx-gcc7-bootstrap.spec +++ b/cross-rx-gcc7-bootstrap.spec @@ -366,11 +366,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-rx-gcc7.changes b/cross-rx-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-rx-gcc7.changes +++ b/cross-rx-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-rx-gcc7.spec b/cross-rx-gcc7.spec index 1003558..0a10e37 100644 --- a/cross-rx-gcc7.spec +++ b/cross-rx-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-s390x-gcc7.changes b/cross-s390x-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-s390x-gcc7.changes +++ b/cross-s390x-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-s390x-gcc7.spec b/cross-s390x-gcc7.spec index cbce1c3..92127ba 100644 --- a/cross-s390x-gcc7.spec +++ b/cross-s390x-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-sparc-gcc7.changes b/cross-sparc-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-sparc-gcc7.changes +++ b/cross-sparc-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-sparc-gcc7.spec b/cross-sparc-gcc7.spec index 523bd8f..7edc78e 100644 --- a/cross-sparc-gcc7.spec +++ b/cross-sparc-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-sparc64-gcc7.changes b/cross-sparc64-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-sparc64-gcc7.changes +++ b/cross-sparc64-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-sparc64-gcc7.spec b/cross-sparc64-gcc7.spec index 202f007..0a10e82 100644 --- a/cross-sparc64-gcc7.spec +++ b/cross-sparc64-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/cross-x86_64-gcc7.changes b/cross-x86_64-gcc7.changes index d3c6bfb..f174631 100644 --- a/cross-x86_64-gcc7.changes +++ b/cross-x86_64-gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/cross-x86_64-gcc7.spec b/cross-x86_64-gcc7.spec index 22135ea..4387539 100644 --- a/cross-x86_64-gcc7.spec +++ b/cross-x86_64-gcc7.spec @@ -365,11 +365,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/gcc.spec.in b/gcc.spec.in index 9aebde8..9b6df7e 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -95,8 +95,6 @@ %endif %endif %define libgomp_sover 1 -%define libgomp_plugin_hsa_sover 1 -%define libgomp_plugin_nvptx_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 4 @@ -129,8 +127,6 @@ %define libgcc_s_suffix %{plv libgcc_s %{libgcc_s}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} -%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} -%define libgomp_plugin_nvptx_suffix %{plv libgomp-plugin-nvptx %{libgomp_plugin_nvptx_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -1199,11 +1195,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ @@ -2123,10 +2124,10 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %defattr(-,root,root) %mainlib libgomp.so.%{libgomp_sover}* %if %{build_hsa} -%mainlib libgomp-plugin-hsa.so.%{libgomp_plugin_hsa_sover}* +%mainlib libgomp-plugin-hsa.so.%{libgomp_sover}* %endif %if %{build_nvptx} -%mainlib libgomp-plugin-nvptx.so.%{libgomp_plugin_nvptx_sover}* +%mainlib libgomp-plugin-nvptx.so.%{libgomp_sover}* %endif %if %{separate_biarch} @@ -2135,7 +2136,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc@base_ver@-locale.lang %biarchlib libgomp.so.%{libgomp_sover}* %endif %if %{build_nvptx} -%biarchlib libgomp-plugin-nvptx.so.%{libgomp_plugin_nvptx_sover}* +%biarchlib libgomp-plugin-nvptx.so.%{libgomp_sover}* %endif diff --git a/gcc7-testresults.changes b/gcc7-testresults.changes index d3c6bfb..f174631 100644 --- a/gcc7-testresults.changes +++ b/gcc7-testresults.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/gcc7-testresults.spec b/gcc7-testresults.spec index 9744636..7c6d9ca 100644 --- a/gcc7-testresults.spec +++ b/gcc7-testresults.spec @@ -111,8 +111,6 @@ %endif %endif %define libgomp_sover 1 -%define libgomp_plugin_hsa_sover 1 -%define libgomp_plugin_nvptx_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 4 @@ -145,8 +143,6 @@ %define libgcc_s_suffix %{plv libgcc_s %{libgcc_s}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} -%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} -%define libgomp_plugin_nvptx_suffix %{plv libgomp-plugin-nvptx %{libgomp_plugin_nvptx_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -564,11 +560,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ diff --git a/gcc7.changes b/gcc7.changes index d3c6bfb..f174631 100644 --- a/gcc7.changes +++ b/gcc7.changes @@ -3,7 +3,8 @@ Fri Jan 20 08:36:18 UTC 2017 - rguenther@suse.com - Update to gcc trunk head (r244684). - Use --with-gcc-major-version-only and drop gcc-dir-version.patch. -- Enable offloading for nvptx-none. +- Enable offloading for nvptx-none on the host (offload compiler still + missing). Re-enable HSA offloading. - Re-add missing cross.spec.in and enable crosses. ------------------------------------------------------------------- diff --git a/gcc7.spec b/gcc7.spec index d448534..a4aa560 100644 --- a/gcc7.spec +++ b/gcc7.spec @@ -93,8 +93,6 @@ %endif %endif %define libgomp_sover 1 -%define libgomp_plugin_hsa_sover 1 -%define libgomp_plugin_nvptx_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 4 @@ -127,8 +125,6 @@ %define libgcc_s_suffix %{plv libgcc_s %{libgcc_s}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} -%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} -%define libgomp_plugin_nvptx_suffix %{plv libgomp-plugin-nvptx %{libgomp_plugin_nvptx_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -1892,11 +1888,16 @@ TCFLAGS="$RPM_OPT_FLAGS" \ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} || %{build_nvptx} + --enable-offload-targets=\ %if %{build_hsa} - --enable-offload-targets=hsa \ +hsa,\ +%endif +%if %{build_nvptx} +nvptx-none=%{_prefix}/nvptx-none, \ +%endif %endif %if %{build_nvptx} - --enable-offload-targets=nvptx-none=%{_prefix}/nvptx-none \ --without-cuda-driver \ %endif $ENABLE_CHECKING \ @@ -2808,10 +2809,10 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc7-locale.lang %defattr(-,root,root) %mainlib libgomp.so.%{libgomp_sover}* %if %{build_hsa} -%mainlib libgomp-plugin-hsa.so.%{libgomp_plugin_hsa_sover}* +%mainlib libgomp-plugin-hsa.so.%{libgomp_sover}* %endif %if %{build_nvptx} -%mainlib libgomp-plugin-nvptx.so.%{libgomp_plugin_nvptx_sover}* +%mainlib libgomp-plugin-nvptx.so.%{libgomp_sover}* %endif %if %{separate_biarch} @@ -2820,7 +2821,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuffix}.lang > gcc7-locale.lang %biarchlib libgomp.so.%{libgomp_sover}* %endif %if %{build_nvptx} -%biarchlib libgomp-plugin-nvptx.so.%{libgomp_plugin_nvptx_sover}* +%biarchlib libgomp-plugin-nvptx.so.%{libgomp_sover}* %endif %ifarch %asan_arch