Hello community, here is the log from the commit of package gcc6 for openSUSE:Factory checked in at 2016-05-05 08:13:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcc6 (Old) and /work/SRC/openSUSE:Factory/.gcc6.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc6" Changes: -------- --- /work/SRC/openSUSE:Factory/gcc6/cross-aarch64-gcc6.changes 2016-04-14 13:02:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcc6.new/cross-aarch64-gcc6.changes 2016-05-05 08:13:04.000000000 +0200 @@ -1,0 +2,34 @@ +Wed May 4 08:27:42 UTC 2016 - [email protected] + +- Fix HSA build conditional for crosses. + +------------------------------------------------------------------- +Mon May 2 07:22:08 UTC 2016 - [email protected] + +- Update to gcc-6-branch head (r235696). + * Fixes libgcj_bc1 version check issue. + +------------------------------------------------------------------- +Wed Apr 27 10:37:26 UTC 2016 - [email protected] + +- Update to GCC 6.1.0 release (r235473). + * Includes fix for python3 miscompile [bnc#976024] +- Enable profiledbootstrap, but not if building libjava where also + disable bootstrap + +------------------------------------------------------------------- +Mon Apr 18 14:01:38 UTC 2016 - [email protected] + +- Add gcc6-hsa-enablement.patch and enable HSA offloading target. + +------------------------------------------------------------------- +Thu Apr 14 12:38:43 UTC 2016 - [email protected] + +- Update to SVN trunk head (r234970). + +------------------------------------------------------------------- +Thu Apr 14 12:05:43 UTC 2016 - [email protected] + +- Enable Ada on ppc64le and aarch64. + +------------------------------------------------------------------- cross-armv6hl-gcc6.changes: same change cross-armv7hl-gcc6.changes: same change cross-avr-gcc6.changes: same change cross-i386-gcc6.changes: same change cross-m68k-gcc6.changes: same change cross-ppc64-gcc6.changes: same change cross-ppc64le-gcc6.changes: same change cross-s390x-gcc6.changes: same change cross-sparc-gcc6.changes: same change cross-sparc64-gcc6.changes: same change cross-x86_64-gcc6.changes: same change gcc6-testresults.changes: same change gcc6.changes: same change libgcj-gcc6.changes: same change Old: ---- gcc-6.0.0-r234449.tar.bz2 New: ---- gcc-6.1.1-r235696.tar.bz2 gcc6-hsa-enablement.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-aarch64-gcc6.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -38,6 +38,7 @@ %define build_objc 0 %define build_objcp 0 %define build_go 0 +%define build_hsa 0 %define binutils_target %{cross_arch} %if %{cross_arch} == "armv7l" || %{cross_arch} == "armv7hl" @@ -114,7 +115,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -147,6 +148,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -219,6 +221,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -361,6 +364,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -384,6 +390,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ cross-armv6hl-gcc6.spec: same change cross-armv7hl-gcc6.spec: same change cross-avr-gcc6.spec: same change cross-i386-gcc6.spec: same change cross-m68k-gcc6.spec: same change cross-ppc64-gcc6.spec: same change cross-ppc64le-gcc6.spec: same change cross-s390x-gcc6.spec: same change cross-sparc-gcc6.spec: same change cross-sparc64-gcc6.spec: same change cross-x86_64-gcc6.spec: same change ++++++ gcc6-testresults.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -38,7 +38,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -96,6 +100,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -110,6 +120,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -146,6 +157,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -254,7 +266,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -325,6 +337,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -448,6 +461,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -590,6 +604,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -613,6 +630,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -755,11 +775,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen ++++++ gcc6.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -20,7 +20,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -78,6 +82,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -92,6 +102,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -128,6 +139,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -236,7 +248,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -307,6 +319,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -1937,6 +1950,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -2079,6 +2093,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -2102,6 +2119,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -2244,11 +2264,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen @@ -2323,7 +2347,7 @@ # Remove some useless .la files for lib in libobjc libgfortran libquadmath libcaf_single \ - libgomp libstdc++ libsupc++ libgcj-tools libgij libgo \ + libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgcj-tools libgij libgo \ libasan libatomic libitm libtsan libcilkrts liblsan libubsan libvtv \ libmpx libmpxwrappers libstdc++fs; do rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la @@ -2408,6 +2432,9 @@ libgo \ %endif libgomp \ +%if %{build_hsa} + libgomp-plugin-hsa \ +%endif %ifarch %atomic_arch libatomic \ %endif @@ -2452,7 +2479,7 @@ fi %endif done -# FIXME, tsan and lsan are not multilib +# FIXME, tsan and lsan (and libgomp-plugin-hsa) are not multilib %ifarch %tsan_arch %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libtsan.so @@ -2462,6 +2489,9 @@ %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/liblsan.so %endif +%if %{biarch} && %{build_hsa} +rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libgomp-plugin-hsa.so +%endif %endif %if %{build_cp} %if !0%{?building_libjava:1} @@ -2884,6 +2914,9 @@ %versmainlib libgomp.so %versmainlib libgomp.a %versmainlib libgomp.spec +%if %{build_hsa} +%versmainlib libgomp-plugin-hsa.so +%endif %ifarch %itm_arch %versmainlib libitm.so %versmainlib libitm.a @@ -3079,6 +3112,9 @@ %files -n libgomp%{libgomp_sover}%{libgomp_suffix} %defattr(-,root,root) %mainlib libgomp.so.%{libgomp_sover}* +%if %{build_hsa} +%mainlib libgomp-plugin-hsa.so.%{libgomp_plugin_hsa_sover}* +%endif %if %{separate_biarch} %files -n libgomp%{libgomp_sover}%{libgomp_suffix}%{separate_biarch_suffix} ++++++ libgcj-gcc6.spec ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -37,7 +37,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -95,6 +99,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -109,6 +119,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -145,6 +156,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -253,7 +265,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 Url: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 0 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -324,6 +336,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -711,6 +724,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -853,6 +867,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -876,6 +893,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -1018,11 +1038,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen @@ -1097,7 +1121,7 @@ # Remove some useless .la files for lib in libobjc libgfortran libquadmath libcaf_single \ - libgomp libstdc++ libsupc++ libgcj-tools libgij libgo \ + libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgcj-tools libgij libgo \ libasan libatomic libitm libtsan libcilkrts liblsan libubsan libvtv \ libmpx libmpxwrappers libstdc++fs; do rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la @@ -1136,6 +1160,9 @@ libgo \ %endif libgomp \ +%if %{build_hsa} + libgomp-plugin-hsa \ +%endif %ifarch %atomic_arch libatomic \ %endif @@ -1180,7 +1207,7 @@ fi %endif done -# FIXME, tsan and lsan are not multilib +# FIXME, tsan and lsan (and libgomp-plugin-hsa) are not multilib %ifarch %tsan_arch %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libtsan.so @@ -1190,6 +1217,9 @@ %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/liblsan.so %endif +%if %{biarch} && %{build_hsa} +rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libgomp-plugin-hsa.so +%endif %endif %if %{build_cp} %if !0%{?building_libjava:1} ++++++ cross.spec.in ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -17,6 +17,7 @@ %define build_objc 0 %define build_objcp 0 %define build_go 0 +%define build_hsa 0 %define binutils_target %{cross_arch} %if %{cross_arch} == "armv7l" || %{cross_arch} == "armv7hl" ++++++ gcc-6.0.0-r234449.tar.bz2 -> gcc-6.1.1-r235696.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/gcc6/gcc-6.0.0-r234449.tar.bz2 /work/SRC/openSUSE:Factory/.gcc6.new/gcc-6.1.1-r235696.tar.bz2 differ: char 11, line 1 ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.9I0CsU/_old 2016-05-05 08:13:09.000000000 +0200 +++ /var/tmp/diff_new_pack.9I0CsU/_new 2016-05-05 08:13:09.000000000 +0200 @@ -22,7 +22,11 @@ # Ada currently fails to build on a few platforms, enable it only # on those that work %if %{suse_version} >= 1310 +%if %{suse_version} >= 1330 +%define ada_arch %ix86 x86_64 ppc ppc64 ppc64le s390 ia64 aarch64 +%else %define ada_arch %ix86 x86_64 ppc ppc64 s390 ia64 +%endif %else %define ada_arch %ix86 x86_64 ppc s390 ia64 %endif @@ -80,6 +84,12 @@ %define build_objcp 0 %endif +%ifarch x86_64 +%define build_hsa 1 +%else +%define build_hsa 0 +%endif + # Shared library SONAME versions %ifarch hppa %define libgcc_s 4 @@ -94,6 +104,7 @@ %define libgcj_bc_sover 1 %define libffi_sover 7 %define libgomp_sover 1 +%define libgomp_plugin_hsa_sover 1 %define libstdcxx_sover 6 %define libobjc_sover 4 %define libgfortran_sover 3 @@ -130,6 +141,7 @@ %define libgcj_bc_suffix %{plv libgcj_bc %{libgcj_bc_sover}} %define libffi_suffix %{plv libffi %{libffi_sover}} %define libgomp_suffix %{plv libgomp %{libgomp_sover}} +%define libgomp_plugin_hsa_suffix %{plv libgomp-plugin-hsa %{libgomp_plugin_hsa_sover}} %define libstdcxx_suffix %{plv libstdcxx %{libstdcxx_sover}} %define libobjc_suffix %{plv libobjc %{libobjc_sover}} %define libgfortran_suffix %{plv libgfortran %{libgfortran_sover}} @@ -242,7 +254,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc sparc sparc64 URL: http://gcc.gnu.org/ -Version: 6.0.0+r234449 +Version: 6.1.1+r235696 Release: 1 %define gcc_version %(echo %version | sed 's/+.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1) @@ -315,6 +327,7 @@ # Some patches taken from Debian Patch60: gcc44-textdomain.patch Patch61: gcc44-rename-info-files.patch +Patch62: gcc6-hsa-enablement.patch #testpatch end @@ -1202,6 +1215,7 @@ %patch51 %patch60 %patch61 +%patch62 -p1 #test patching end @@ -1344,6 +1358,9 @@ --libdir=%{_libdir} \ --libexecdir=%{_libdir} \ --enable-languages=$languages \ +%if %{build_hsa} + --enable-offload-targets=hsa \ +%endif $ENABLE_CHECKING \ --with-gxx-include-dir=%{_prefix}/include/c++/%{gcc_dir_version} \ --enable-ssp \ @@ -1367,6 +1384,9 @@ --disable-libjava-multilib \ %endif %endif +%if 0%{?building_libjava:1} + --disable-bootstrap \ +%endif --with-slibdir=/%{_lib} \ --with-system-zlib \ --enable-__cxa_atexit \ @@ -1511,11 +1531,15 @@ %else STAGE1_FLAGS="-g" # Only run profiled bootstrap on archs where it works and matters -#%ifarch x86_64 ppc64le s390x -#make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%else +%if 0%{?building_libjava:1} make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL -#%endif +%else +%ifarch x86_64 ppc64le s390x +make profiledbootstrap STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%else +make STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" $PARALLEL +%endif +%endif make info %if 0%{?building_libjava:1} make -C %{GCCDIST}/libstdc++-v3/doc doc-html-doxygen @@ -1591,7 +1615,7 @@ # Remove some useless .la files for lib in libobjc libgfortran libquadmath libcaf_single \ - libgomp libstdc++ libsupc++ libgcj-tools libgij libgo \ + libgomp libgomp-plugin-hsa libstdc++ libsupc++ libgcj-tools libgij libgo \ libasan libatomic libitm libtsan libcilkrts liblsan libubsan libvtv \ libmpx libmpxwrappers libstdc++fs; do rm -f $RPM_BUILD_ROOT%{versmainlibdir}/$lib.la @@ -1679,6 +1703,9 @@ libgo \ %endif libgomp \ +%if %{build_hsa} + libgomp-plugin-hsa \ +%endif %ifarch %atomic_arch libatomic \ %endif @@ -1723,7 +1750,7 @@ fi %endif done -# FIXME, tsan and lsan are not multilib +# FIXME, tsan and lsan (and libgomp-plugin-hsa) are not multilib %ifarch %tsan_arch %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libtsan.so @@ -1733,6 +1760,9 @@ %if %{biarch} rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/liblsan.so %endif +%if %{biarch} && %{build_hsa} +rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/libgomp-plugin-hsa.so +%endif %endif %if %{build_cp} %if !0%{?building_libjava:1} @@ -2167,6 +2197,9 @@ %versmainlib libgomp.so %versmainlib libgomp.a %versmainlib libgomp.spec +%if %{build_hsa} +%versmainlib libgomp-plugin-hsa.so +%endif %ifarch %itm_arch %versmainlib libitm.so %versmainlib libitm.a @@ -2363,6 +2396,9 @@ %files -n libgomp%{libgomp_sover}%{libgomp_suffix} %defattr(-,root,root) %mainlib libgomp.so.%{libgomp_sover}* +%if %{build_hsa} +%mainlib libgomp-plugin-hsa.so.%{libgomp_plugin_hsa_sover}* +%endif %if %{separate_biarch} %files -n libgomp%{libgomp_sover}%{libgomp_suffix}%{separate_biarch_suffix} ++++++ gcc6-hsa-enablement.patch ++++++ ++++ 1763 lines (skipped)
