Rebase to gcc 11.2.1, same as Fedora Rawhide

resolves: rhbz#1953914
This commit is contained in:
Richard W.M. Jones 2021-08-12 09:52:48 +01:00
parent 3324bb1cd5
commit d0c3401795
5 changed files with 34 additions and 35 deletions

4
.gitignore vendored
View File

@ -39,3 +39,7 @@ gcc-4.5.1.tar.bz2
/gcc-9.2.1-20190827.tar.xz /gcc-9.2.1-20190827.tar.xz
/gcc-10.1.1-20200618.tar.xz /gcc-10.1.1-20200618.tar.xz
/gcc-10.2.1-20200723.tar.xz /gcc-10.2.1-20200723.tar.xz
/gcc-10.3.1-20210422.tar.xz
/gcc-11.1.1-20210428.tar.xz
/gcc-11.1.1-20210623.tar.xz
/gcc-11.2.1-20210728.tar.xz

View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gcc-10.2.1-20200723/libgomp/libgomp.h gcc-10.2.1-20200723-new/libgomp/libgomp.h diff -rupN --no-dereference gcc-11.2.1-20210728/libgomp/libgomp.h gcc-11.2.1-20210728-new/libgomp/libgomp.h
--- gcc-10.2.1-20200723/libgomp/libgomp.h 2020-07-23 11:18:20.000000000 +0200 --- gcc-11.2.1-20210728/libgomp/libgomp.h 2021-07-28 11:09:49.000000000 +0200
+++ gcc-10.2.1-20200723-new/libgomp/libgomp.h 2021-01-19 21:29:10.649983667 +0100 +++ gcc-11.2.1-20210728-new/libgomp/libgomp.h 2021-07-30 11:20:02.737945857 +0200
@@ -69,6 +69,13 @@ @@ -69,6 +69,13 @@
# endif # endif
#endif #endif

View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gcc-10.2.1-20200723/config/intdiv0.m4 gcc-10.2.1-20200723-new/config/intdiv0.m4 diff -rupN --no-dereference gcc-11.2.1-20210728/config/intdiv0.m4 gcc-11.2.1-20210728-new/config/intdiv0.m4
--- gcc-10.2.1-20200723/config/intdiv0.m4 2020-07-23 11:18:20.000000000 +0200 --- gcc-11.2.1-20210728/config/intdiv0.m4 2021-07-28 11:09:49.000000000 +0200
+++ gcc-10.2.1-20200723-new/config/intdiv0.m4 2020-07-23 18:21:10.151598317 +0200 +++ gcc-11.2.1-20210728-new/config/intdiv0.m4 2021-07-30 11:19:58.858765997 +0200
@@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig; @@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig;
exit (sig != SIGFPE); exit (sig != SIGFPE);
} }
@ -16,10 +16,10 @@ diff -rupN --no-dereference gcc-10.2.1-20200723/config/intdiv0.m4 gcc-10.2.1-202
int main () int main ()
{ {
diff -rupN --no-dereference gcc-10.2.1-20200723/libiberty/aclocal.m4 gcc-10.2.1-20200723-new/libiberty/aclocal.m4 diff -rupN --no-dereference gcc-11.2.1-20210728/libiberty/acinclude.m4 gcc-11.2.1-20210728-new/libiberty/acinclude.m4
--- gcc-10.2.1-20200723/libiberty/aclocal.m4 2020-07-23 11:18:20.000000000 +0200 --- gcc-11.2.1-20210728/libiberty/acinclude.m4 2021-07-28 11:09:49.000000000 +0200
+++ gcc-10.2.1-20200723-new/libiberty/aclocal.m4 2020-07-23 18:21:10.150598319 +0200 +++ gcc-11.2.1-20210728-new/libiberty/acinclude.m4 2021-07-30 11:19:58.859766044 +0200
@@ -149,7 +149,7 @@ if test $ac_cv_os_cray = yes; then @@ -157,7 +157,7 @@ if test $ac_cv_os_cray = yes; then
fi fi
AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
@ -28,10 +28,10 @@ diff -rupN --no-dereference gcc-10.2.1-20200723/libiberty/aclocal.m4 gcc-10.2.1-
{ {
static char *addr = 0; static char *addr = 0;
auto char dummy; auto char dummy;
diff -rupN --no-dereference gcc-10.2.1-20200723/libiberty/configure.ac gcc-10.2.1-20200723-new/libiberty/configure.ac diff -rupN --no-dereference gcc-11.2.1-20210728/libiberty/configure.ac gcc-11.2.1-20210728-new/libiberty/configure.ac
--- gcc-10.2.1-20200723/libiberty/configure.ac 2020-07-23 11:18:20.000000000 +0200 --- gcc-11.2.1-20210728/libiberty/configure.ac 2021-07-28 11:09:49.000000000 +0200
+++ gcc-10.2.1-20200723-new/libiberty/configure.ac 2020-07-23 18:21:10.151598317 +0200 +++ gcc-11.2.1-20210728-new/libiberty/configure.ac 2021-07-30 11:19:58.859766044 +0200
@@ -664,7 +664,7 @@ if test -z "${setobjs}"; then @@ -665,7 +665,7 @@ if test -z "${setobjs}"; then
for v in $vars; do for v in $vars; do
AC_MSG_CHECKING([for $v]) AC_MSG_CHECKING([for $v])
AC_CACHE_VAL(libiberty_cv_var_$v, AC_CACHE_VAL(libiberty_cv_var_$v,

View File

@ -23,14 +23,14 @@
# Run the testsuite # Run the testsuite
%global enable_tests 0 %global enable_tests 0
%global DATE 20200723 %global DATE 20210728
%global GITREV 3fc88aa16f1bf661db4518d6d62869f081981981 %global GITREV 134ab8155c937122663513b76afa8e64ad61fe99
%global gcc_version 10.2.1 %global gcc_version 11.2.1
%global gcc_major 10 %global gcc_major 11
Name: mingw-gcc Name: mingw-gcc
Version: %{gcc_version} Version: %{gcc_version}
Release: 8%{?dist} Release: 3%{?dist}
Summary: MinGW Windows cross-compiler (GCC) for C Summary: MinGW Windows cross-compiler (GCC) for C
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
@ -48,7 +48,6 @@ Patch0: mingw-gcc-config.patch
# See https://sourceforge.net/p/mingw-w64/mailman/mingw-w64-public/thread/8fd2fb03-9b8a-07e1-e162-0bb48bcc3984%40gmail.com/#msg37200751 # See https://sourceforge.net/p/mingw-w64/mailman/mingw-w64-public/thread/8fd2fb03-9b8a-07e1-e162-0bb48bcc3984%40gmail.com/#msg37200751
Patch1: 0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch Patch1: 0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
BuildRequires: autoconf
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: make BuildRequires: make
BuildRequires: texinfo BuildRequires: texinfo
@ -228,14 +227,6 @@ needed for OpenMP v3.0 support for the win32 target.
%autosetup -p1 -n %{srcdir} %autosetup -p1 -n %{srcdir}
echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE echo 'Fedora MinGW %{version}-%{release}' > gcc/DEV-PHASE
# Force updating the configure files after patching the .m4 files
pushd libiberty
autoconf -f
popd
pushd intl
autoconf -f
popd
%build %build
# Default configure arguments # Default configure arguments
configure_args="\ configure_args="\
@ -435,10 +426,12 @@ find %{buildroot} -name '*.la' -delete
rm -f %{buildroot}%{_bindir}/%{mingw32_target}-%{mingw32_target}-* rm -f %{buildroot}%{_bindir}/%{mingw32_target}-%{mingw32_target}-*
rm -f %{buildroot}%{_bindir}/%{mingw64_target}-%{mingw64_target}-* rm -f %{buildroot}%{_bindir}/%{mingw64_target}-%{mingw64_target}-*
%if 0%{bootstrap} == 0
# HACK symlink libssp dll over import lib, otherwise linking with -lssp failes for mysterious reasons # HACK symlink libssp dll over import lib, otherwise linking with -lssp failes for mysterious reasons
# Needed to build gdb and everything which adds -D_FORTIFY_SOURCES=... and -fstack-protector # Needed to build gdb and everything which adds -D_FORTIFY_SOURCES=... and -fstack-protector
ln -sf %{mingw32_bindir}/libssp-0.dll %{buildroot}%{mingw32_libdir}/libssp.dll.a ln -sf %{mingw32_bindir}/libssp-0.dll %{buildroot}%{mingw32_libdir}/libssp.dll.a
ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%endif
%files -n mingw32-gcc %files -n mingw32-gcc
@ -487,10 +480,9 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/libgcov.a %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/libgcov.a
%dir %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/ssp %dir %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/ssp
%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/ssp/*.h %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/ssp/*.h
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/g++-mapper-server
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/lto1 %{_libexecdir}/gcc/%{mingw32_target}/%{version}/lto1
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so %{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so*
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so.0
%{_libexecdir}/gcc/%{mingw32_target}/%{version}/liblto_plugin.so.0.0.0
%{_mandir}/man1/%{mingw32_target}-lto-dump.1* %{_mandir}/man1/%{mingw32_target}-lto-dump.1*
%endif %endif
@ -540,10 +532,9 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/libgcov.a %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/libgcov.a
%dir %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/ssp %dir %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/ssp
%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/ssp/*.h %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/ssp/*.h
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/g++-mapper-server
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/lto1 %{_libexecdir}/gcc/%{mingw64_target}/%{version}/lto1
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so %{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so*
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so.0
%{_libexecdir}/gcc/%{mingw64_target}/%{version}/liblto_plugin.so.0.0.0
%{_mandir}/man1/%{mingw64_target}-lto-dump.1* %{_mandir}/man1/%{mingw64_target}-lto-dump.1*
%endif %endif
@ -669,6 +660,10 @@ ln -sf %{mingw64_bindir}/libssp-0.dll %{buildroot}%{mingw64_libdir}/libssp.dll.a
%changelog %changelog
* Thu Aug 12 2021 Richard W.M. Jones <rjones@redhat.com> - 11.2.1-3
- Rebase to gcc 11.2.1, same as Fedora Rawhide
resolves: rhbz#1953914
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 10.2.1-8 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 10.2.1-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688

View File

@ -1 +1 @@
SHA512 (gcc-10.2.1-20200723.tar.xz) = e1719e4a18f43bb76acb91c0d768711e78d7e8c478b72e691911094e233570597997ed108ba7ed4fb136542993af935ea38ec462a1972689c9220d4cc0e2933f SHA512 (gcc-11.2.1-20210728.tar.xz) = 2234298652f882151aead486bb22481ba8181df69b9c7c5d73b8aa505ace58462fcd0b482680f466e2d21dc47e869651c7dbf224b65791ca47204dab01e89e7c