From 7b33fc5205760cae295ee201c8348e07c3db3f43 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 9 Dec 2020 09:46:59 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/gcc.git#42f8421576faf950dddfe9578f9bfca7d2720863 --- .gitignore | 9 ++-- gcc.spec | 108 ++++++++++++++++++++++++++---------------- gcc11-sys-timeb.patch | 34 ------------- sources | 2 +- 4 files changed, 71 insertions(+), 82 deletions(-) delete mode 100644 gcc11-sys-timeb.patch diff --git a/.gitignore b/.gitignore index 7a5a3ce..0d11d30 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,7 @@ /gcc-10.2.1-20200916.tar.xz /gcc-10.2.1-20201005.tar.xz /gcc-10.2.1-20201016.tar.xz -/gcc-11.0.0-20201019.tar.xz -/gcc-11.0.0-20201029.tar.xz -/gcc-11.0.0-20201121.tar.xz -/gcc-11.0.0-20201124.tar.xz -/gcc-11.0.0-20201126.tar.xz +/gcc-10.2.1-20201102.tar.xz +/gcc-10.2.1-20201112.tar.xz +/gcc-10.2.1-20201125.tar.xz +/gcc-11.0.0-20201204.tar.xz diff --git a/gcc.spec b/gcc.spec index 5c0b3ee..acd4ef1 100644 --- a/gcc.spec +++ b/gcc.spec @@ -1,5 +1,5 @@ -%global DATE 20201126 -%global gitrev 561c0f66b6c791fe35981f8bda9cc532fc407e6d +%global DATE 20201204 +%global gitrev d35391d824edee33b5fbce3df058f4fafd9b9fa6 %global gcc_version 11.0.0 %global gcc_major 11 # Note, gcc_release must be integer, if you want to add suffixes to @@ -119,12 +119,14 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}.6%{?dist} +Release: %{gcc_release}.7%{?dist} # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have # GCC Runtime Exception. License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD -# The source for this package was pulled from upstream's vcs. Use the -# following commands to generate the tarball: +# The source for this package was pulled from upstream's vcs. +# %%{gitrev} is some commit from the +# https://gcc.gnu.org/git/?p=gcc.git;h=refs/vendors/redhat/heads/gcc-%%{gcc_major}-branch +# branch. Use the following commands to generate the tarball: # git clone --depth 1 git://gcc.gnu.org/git/gcc.git gcc-dir.tmp # git --git-dir=gcc-dir.tmp/.git fetch --depth 1 origin %%{gitrev} # git --git-dir=gcc-dir.tmp/.git archive --prefix=%%{name}-%%{version}-%%{DATE}/ %%{gitrev} | xz -9e > %%{name}-%%{version}-%%{DATE}.tar.xz @@ -270,7 +272,6 @@ Patch8: gcc11-foffload-default.patch Patch9: gcc11-Wno-format-security.patch Patch10: gcc11-rh1574936.patch Patch11: gcc11-d-shared-libphobos.patch -Patch12: gcc11-sys-timeb.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -292,7 +293,7 @@ Patch12: gcc11-sys-timeb.patch %if %{build_go} # Avoid stripping these libraries and binaries. %global __os_install_post \ -chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.17.* \ +chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.18.* \ chmod 644 %{buildroot}%{_prefix}/bin/go.gcc \ chmod 644 %{buildroot}%{_prefix}/bin/gofmt.gcc \ chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo \ @@ -300,7 +301,7 @@ chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major} chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/test2json \ chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/vet \ %__os_install_post \ -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgo.so.17.* \ +chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgo.so.18.* \ chmod 755 %{buildroot}%{_prefix}/bin/go.gcc \ chmod 755 %{buildroot}%{_prefix}/bin/gofmt.gcc \ chmod 755 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo \ @@ -782,8 +783,6 @@ to NVidia PTX capable devices if available. %patch10 -p0 -b .rh1574936~ %endif %patch11 -p0 -b .d-shared-libphobos~ -#%patch12 -p0 -b .sys-timeb~ -rm -f libstdc++-v3/testsuite/29_atomics/atomic_float/1.cc libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE @@ -1387,14 +1386,14 @@ ln -sf ../../../libstdc++.so.6.*[0-9] libstdc++.so ln -sf ../../../libgfortran.so.5.* libgfortran.so ln -sf ../../../libgomp.so.1.* libgomp.so %if %{build_go} -ln -sf ../../../libgo.so.17.* libgo.so +ln -sf ../../../libgo.so.18.* libgo.so %endif %if %{build_libquadmath} ln -sf ../../../libquadmath.so.0.* libquadmath.so %endif %if %{build_d} -ln -sf ../../../libgdruntime.so.1.* libgdruntime.so -ln -sf ../../../libgphobos.so.1.* libgphobos.so +ln -sf ../../../libgdruntime.so.2.* libgdruntime.so +ln -sf ../../../libgphobos.so.2.* libgphobos.so %endif %if %{build_libitm} ln -sf ../../../libitm.so.1.* libitm.so @@ -1417,14 +1416,14 @@ ln -sf ../../../../%{_lib}/libstdc++.so.6.*[0-9] libstdc++.so ln -sf ../../../../%{_lib}/libgfortran.so.5.* libgfortran.so ln -sf ../../../../%{_lib}/libgomp.so.1.* libgomp.so %if %{build_go} -ln -sf ../../../../%{_lib}/libgo.so.17.* libgo.so +ln -sf ../../../../%{_lib}/libgo.so.18.* libgo.so %endif %if %{build_libquadmath} ln -sf ../../../../%{_lib}/libquadmath.so.0.* libquadmath.so %endif %if %{build_d} -ln -sf ../../../../%{_lib}/libgdruntime.so.1.* libgdruntime.so -ln -sf ../../../../%{_lib}/libgphobos.so.1.* libgphobos.so +ln -sf ../../../../%{_lib}/libgdruntime.so.2.* libgdruntime.so +ln -sf ../../../../%{_lib}/libgphobos.so.2.* libgphobos.so %endif %if %{build_libitm} ln -sf ../../../../%{_lib}/libitm.so.1.* libitm.so @@ -1501,28 +1500,28 @@ mv -f $FULLPATH/ada{include,lib} $FULLLPATH/ pushd $FULLLPATH/adalib if [ "%{_lib}" = "lib" ]; then ln -sf ../../../../../libgnarl-*.so libgnarl.so -ln -sf ../../../../../libgnarl-*.so libgnarl-9.so +ln -sf ../../../../../libgnarl-*.so libgnarl-11.so ln -sf ../../../../../libgnat-*.so libgnat.so -ln -sf ../../../../../libgnat-*.so libgnat-9.so +ln -sf ../../../../../libgnat-*.so libgnat-11.so else ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl.so -ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-9.so +ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-11.so ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat.so -ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-9.so +ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-11.so fi popd else pushd $FULLPATH/adalib if [ "%{_lib}" = "lib" ]; then ln -sf ../../../../libgnarl-*.so libgnarl.so -ln -sf ../../../../libgnarl-*.so libgnarl-9.so +ln -sf ../../../../libgnarl-*.so libgnarl-11.so ln -sf ../../../../libgnat-*.so libgnat.so -ln -sf ../../../../libgnat-*.so libgnat-9.so +ln -sf ../../../../libgnat-*.so libgnat-11.so else ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl.so -ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-9.so +ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-11.so ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat.so -ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-9.so +ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-11.so fi popd fi @@ -1537,8 +1536,8 @@ ln -sf ../`echo ../../../../lib/libgfortran.so.5.* | sed s~/lib/~/lib64/~` 64/li ln -sf ../`echo ../../../../lib/libgomp.so.1.* | sed s~/lib/~/lib64/~` 64/libgomp.so %if %{build_go} rm -f libgo.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.17.* | sed 's,^.*libg,libg,'`' )' > libgo.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.17.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.18.* | sed 's,^.*libg,libg,'`' )' > libgo.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.18.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so %endif %if %{build_libquadmath} rm -f libquadmath.so @@ -1547,10 +1546,10 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libquadmath.so.0.* | sed ' %endif %if %{build_d} rm -f libgdruntime.so libgphobos.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgdruntime.so.1.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgdruntime.so.1.* | sed 's,^.*libg,libg,'`' )' > 64/libgdruntime.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgphobos.so.1.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgphobos.so.1.* | sed 's,^.*libg,libg,'`' )' > 64/libgphobos.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgdruntime.so.2.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgdruntime.so.2.* | sed 's,^.*libg,libg,'`' )' > 64/libgdruntime.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgphobos.so.2.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgphobos.so.2.* | sed 's,^.*libg,libg,'`' )' > 64/libgphobos.so %endif %if %{build_libitm} rm -f libitm.so @@ -1636,8 +1635,8 @@ ln -sf ../`echo ../../../../lib64/libgfortran.so.5.* | sed s~/../lib64/~/~` 32/l ln -sf ../`echo ../../../../lib64/libgomp.so.1.* | sed s~/../lib64/~/~` 32/libgomp.so %if %{build_go} rm -f libgo.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.17.* | sed 's,^.*libg,libg,'`' )' > libgo.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.17.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.18.* | sed 's,^.*libg,libg,'`' )' > libgo.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.18.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so %endif %if %{build_libquadmath} rm -f libquadmath.so @@ -1646,10 +1645,10 @@ echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libquadmath.so.0.* | sed ' %endif %if %{build_d} rm -f libgdruntime.so libgphobos.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgdruntime.so.1.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgdruntime.so.1.* | sed 's,^.*libg,libg,'`' )' > 32/libgdruntime.so -echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgphobos.so.1.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so -echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgphobos.so.1.* | sed 's,^.*libg,libg,'`' )' > 32/libgphobos.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgdruntime.so.2.* | sed 's,^.*libg,libg,'`' )' > libgdruntime.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgdruntime.so.2.* | sed 's,^.*libg,libg,'`' )' > 32/libgdruntime.so +echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgphobos.so.2.* | sed 's,^.*libg,libg,'`' )' > libgphobos.so +echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgphobos.so.2.* | sed 's,^.*libg,libg,'`' )' > 32/libgphobos.so %endif %if %{build_libitm} rm -f libitm.so @@ -1801,8 +1800,8 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/libcc1.so.0.* chmod 755 %{buildroot}%{_prefix}/%{_lib}/libquadmath.so.0.* %endif %if %{build_d} -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgdruntime.so.1.* -chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgphobos.so.1.* +chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgdruntime.so.2.* +chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgphobos.so.2.* %endif %if %{build_libitm} chmod 755 %{buildroot}%{_prefix}/%{_lib}/libitm.so.1.* @@ -1824,7 +1823,7 @@ chmod 755 %{buildroot}%{_prefix}/%{_lib}/liblsan.so.0.* %endif %if %{build_go} # Avoid stripping these libraries and binaries. -chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.17.* +chmod 644 %{buildroot}%{_prefix}/%{_lib}/libgo.so.18.* chmod 644 %{buildroot}%{_prefix}/bin/go.gcc chmod 644 %{buildroot}%{_prefix}/bin/gofmt.gcc chmod 644 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}/cgo @@ -2633,8 +2632,8 @@ end %doc rpm.doc/gdc/* %files -n libgphobos -%{_prefix}/%{_lib}/libgdruntime.so.1* -%{_prefix}/%{_lib}/libgphobos.so.1* +%{_prefix}/%{_lib}/libgdruntime.so.2* +%{_prefix}/%{_lib}/libgphobos.so.2* %doc rpm.doc/libphobos/* %files -n libgphobos-static @@ -2959,7 +2958,7 @@ end %doc rpm.doc/go/* %files -n libgo -%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.17* +%attr(755,root,root) %{_prefix}/%{_lib}/libgo.so.18* %doc rpm.doc/libgo/* %files -n libgo-devel @@ -3067,6 +3066,31 @@ end %endif %changelog +* Fri Dec 4 2020 Jakub Jelinek 11.0.0-0.7 +- update from trunk + - PRs bootstrap/97983, c++/80780, c++/90629, c++/93093, c++/97187, + c++/97947, c++/97975, c++/97993, c++/98019, c++/98054, c++/98072, + c++/98104, c++/98107, c++/98115, c++/98116, c/65455, c/92935, c/97880, + c/98087, d/87788, d/87818, d/98025, debug/97989, fortran/95342, + fortran/98010, fortran/98011, fortran/98013, ipa/88702, ipa/98057, + ipa/98075, jit/97867, libgcc/97543, libgcc/97643, libstdc++/65480, + libstdc++/68735, libstdc++/93121, libstdc++/98001, libstdc++/98003, + middle-end/89428, middle-end/92936, middle-end/92940, + middle-end/93195, middle-end/93197, middle-end/94527, + middle-end/97373, middle-end/97595, middle-end/98070, + middle-end/98082, middle-end/98099, other/98027, plugins/98059, + preprocessor/97602, rtl-optimization/97459, rtl-optimization/97777, + rtl-optimization/97954, rtl-optimization/98037, target/96607, + target/96906, target/97642, target/97770, target/97939, target/98063, + target/98079, target/98086, testsuite/98002, testsuite/98036, + testsuite/98085, tree-optimization/14799, tree-optimization/88702, + tree-optimization/96679, tree-optimization/96708, + tree-optimization/97630, tree-optimization/97953, + tree-optimization/97979, tree-optimization/97997, + tree-optimization/98024, tree-optimization/98048, + tree-optimization/98064, tree-optimization/98066, + tree-optimization/98084 + * Thu Nov 26 2020 Jakub Jelinek 11.0.0-0.6 - update from trunk - PRs bootstrap/94982, bootstrap/97622, bootstrap/97933, c++/97899, c/97958, diff --git a/gcc11-sys-timeb.patch b/gcc11-sys-timeb.patch deleted file mode 100644 index baadb22..0000000 --- a/gcc11-sys-timeb.patch +++ /dev/null @@ -1,34 +0,0 @@ -2020-10-19 Jakub Jelinek - - PR sanitizer/97478 - * sanitizer_common/sanitizer_platform_limits_posix.cpp: Don't include - sys/timeb.h for glibc 2.32 or later nor check struct timeb offsets and - sizes. - ---- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp.jj 2020-10-19 09:32:35.842909854 +0200 -+++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp 2020-10-19 21:29:49.803974760 +0200 -@@ -60,7 +60,9 @@ - #if !SANITIZER_ANDROID - #include - #include -+#if !SANITIZER_LINUX || !__GLIBC_PREREQ (2, 32) - #include -+#endif - #include - #endif - -@@ -1188,12 +1190,14 @@ COMPILER_CHECK(sizeof(__sanitizer_struct - #endif - - #if !SANITIZER_ANDROID -+#if !SANITIZER_LINUX || !__GLIBC_PREREQ (2, 32) - CHECK_TYPE_SIZE(timeb); - CHECK_SIZE_AND_OFFSET(timeb, time); - CHECK_SIZE_AND_OFFSET(timeb, millitm); - CHECK_SIZE_AND_OFFSET(timeb, timezone); - CHECK_SIZE_AND_OFFSET(timeb, dstflag); - #endif -+#endif - - CHECK_TYPE_SIZE(passwd); - CHECK_SIZE_AND_OFFSET(passwd, pw_name); diff --git a/sources b/sources index 58368d0..d4715ed 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (gcc-11.0.0-20201126.tar.xz) = 2177cca26f5c9b82ac6a508361eeea2decd051ca5d6fdb1c02c548a84c9905b9e4689037baa7fe02bf0053863ddba12fcebc478303ee51ceefb75a2ea56dc776 +SHA512 (gcc-11.0.0-20201204.tar.xz) = 809ca1644f7471187dec0f080d70fcf3a778be88d550d3088988331165fa3ebaafb011f07973523d0b5b83e3cd0f7fd5bc10bc80944f035803f1b21e79af7a31 SHA512 (newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz) = 002a48a7b689a81abbf16161bcaec001a842e67dfbe372e9e109092703bfc666675f16198f60ca429370e8850d564547dc505df81bc3aaca4ce6defbc014ad6c SHA512 (nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz) = f6d10db94fa1570ae0f94df073fa3c73c8e5ee16d59070b53d94f7db0de8a031bc44d7f3f1852533da04b625ce758e022263855ed43cfc6867e0708d001e53c7