From 4135fee6ecf02cc0659c0cab72d4848243fc7673 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 3 Jan 2023 09:11:44 +0000 Subject: [PATCH] Rebase to Fedora Rawhide resolves: rhbz#2135769 side-tag: c9s-build-side-1410-stack-gate --- .gitignore | 2 + ...Don-t-hard-code-MS-printf-attributes.patch | 10 +- mingw-gcc-config.patch | 12 +- mingw-gcc.spec | 105 ++++++++++++++---- sources | 2 +- 5 files changed, 97 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 34c6d83..9a131ba 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,5 @@ gcc-4.5.1.tar.bz2 /gcc-12.0.1-20220308.tar.xz /gcc-12.0.1-20220413.tar.xz /gcc-12.1.1-20220507.tar.xz +/gcc-12.1.1-20220628.tar.xz +/gcc-12.2.1-20220819.tar.xz diff --git a/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch b/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch index af889b6..6c1dbfe 100644 --- a/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch +++ b/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gcc-12.1.1-20220507/libgomp/libgomp.h gcc-12.1.1-20220507-new/libgomp/libgomp.h ---- gcc-12.1.1-20220507/libgomp/libgomp.h 2022-05-07 08:37:39.000000000 +0200 -+++ gcc-12.1.1-20220507-new/libgomp/libgomp.h 2022-05-09 22:50:23.568758015 +0200 +diff -rupN --no-dereference gcc-12.2.1-20220819/libgomp/libgomp.h gcc-12.2.1-20220819-new/libgomp/libgomp.h +--- gcc-12.2.1-20220819/libgomp/libgomp.h 2022-08-19 19:14:13.000000000 +0200 ++++ gcc-12.2.1-20220819-new/libgomp/libgomp.h 2022-08-30 09:35:11.552027662 +0200 @@ -69,6 +69,13 @@ # endif #endif @@ -15,7 +15,7 @@ diff -rupN --no-dereference gcc-12.1.1-20220507/libgomp/libgomp.h gcc-12.1.1-202 #ifdef HAVE_ATTRIBUTE_VISIBILITY # pragma GCC visibility push(hidden) #endif -@@ -177,7 +184,7 @@ team_free (void *ptr) +@@ -176,7 +183,7 @@ team_free (void *ptr) extern void gomp_vdebug (int, const char *, va_list); extern void gomp_debug (int, const char *, ...) @@ -24,7 +24,7 @@ diff -rupN --no-dereference gcc-12.1.1-20220507/libgomp/libgomp.h gcc-12.1.1-202 #define gomp_vdebug(KIND, FMT, VALIST) \ do { \ if (__builtin_expect (gomp_debug_var, 0)) \ -@@ -190,11 +197,11 @@ extern void gomp_debug (int, const char +@@ -189,11 +196,11 @@ extern void gomp_debug (int, const char } while (0) extern void gomp_verror (const char *, va_list); extern void gomp_error (const char *, ...) diff --git a/mingw-gcc-config.patch b/mingw-gcc-config.patch index 9fed524..14f8477 100644 --- a/mingw-gcc-config.patch +++ b/mingw-gcc-config.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference gcc-12.1.1-20220507/config/intdiv0.m4 gcc-12.1.1-20220507-new/config/intdiv0.m4 ---- gcc-12.1.1-20220507/config/intdiv0.m4 2022-05-07 08:37:39.000000000 +0200 -+++ gcc-12.1.1-20220507-new/config/intdiv0.m4 2022-05-09 22:50:19.709701677 +0200 +diff -rupN --no-dereference gcc-12.2.1-20220819/config/intdiv0.m4 gcc-12.2.1-20220819-new/config/intdiv0.m4 +--- gcc-12.2.1-20220819/config/intdiv0.m4 2022-08-19 19:14:13.000000000 +0200 ++++ gcc-12.2.1-20220819-new/config/intdiv0.m4 2022-08-30 09:35:05.239027520 +0200 @@ -31,10 +31,10 @@ sigfpe_handler (sig) int sig; exit (sig != SIGFPE); } @@ -16,9 +16,9 @@ diff -rupN --no-dereference gcc-12.1.1-20220507/config/intdiv0.m4 gcc-12.1.1-202 int main () { -diff -rupN --no-dereference gcc-12.1.1-20220507/libiberty/acinclude.m4 gcc-12.1.1-20220507-new/libiberty/acinclude.m4 ---- gcc-12.1.1-20220507/libiberty/acinclude.m4 2022-05-07 08:37:39.000000000 +0200 -+++ gcc-12.1.1-20220507-new/libiberty/acinclude.m4 2022-05-09 22:50:19.709701677 +0200 +diff -rupN --no-dereference gcc-12.2.1-20220819/libiberty/acinclude.m4 gcc-12.2.1-20220819-new/libiberty/acinclude.m4 +--- gcc-12.2.1-20220819/libiberty/acinclude.m4 2022-08-19 19:14:13.000000000 +0200 ++++ gcc-12.2.1-20220819-new/libiberty/acinclude.m4 2022-08-30 09:35:05.240027520 +0200 @@ -157,7 +157,7 @@ if test $ac_cv_os_cray = yes; then fi diff --git a/mingw-gcc.spec b/mingw-gcc.spec index 6fadc53..585a46c 100644 --- a/mingw-gcc.spec +++ b/mingw-gcc.spec @@ -18,14 +18,14 @@ # Run the testsuite %global enable_tests 0 -%global DATE 20220507 -%global GITREV fa107326a13af9a7d7aa0df28fe364db0f6fb171 -%global gcc_version 12.1.1 +%global DATE 20220819 +%global gitrev 12a206c28987ada47b447ebd200d1fd9639c8edd +%global gcc_version 12.2.1 %global gcc_major 12 Name: mingw-gcc Version: %{gcc_version} -Release: 1%{?dist} +Release: 4%{?dist} Summary: MinGW Windows cross-compiler (GCC) for C License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions @@ -252,7 +252,7 @@ Requires: ucrt64-cpp %if 0%{bootstrap} == 0 Requires: ucrt64-crt Requires: ucrt64-libgcc -Requires: mingw64-winpthreads-static +Requires: ucrt64-winpthreads-static %endif @@ -902,28 +902,89 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %changelog -* Thu Jul 21 2022 Richard W.M. Jones - 12.1.1-1 -- Rebase to Fedora Rawhide - resolves: rhbz#2080170 +* Tue Nov 15 2022 Sandro Mani - 12.2.1-4 +- Fix incorrect requires -* Wed Jul 20 2022 Richard W.M. Jones - 12.0.1-11.2 -- Bump release and rebuild - resolves: rhbz#2096010 +* Fri Jul 22 2022 Sandro Mani - 12.1.1-3 +- Update to 20220628 snapshot -* Fri May 06 2022 Richard W.M. Jones - 12.0.1-11.1 -- Rebase to Fedora Rawhide - resolves: rhbz#2080170 +* Thu Jul 21 2022 Fedora Release Engineering - 12.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Thu Aug 12 2021 Richard W.M. Jones - 11.2.1-3 -- Rebase to gcc 11.2.1, same as Fedora Rawhide - resolves: rhbz#1953914 +* Mon May 09 2022 Sandro Mani - 12.1.1-1 +- GCC 12.1 release -* Mon Aug 09 2021 Mohan Boddu - 10.2.1-8 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Wed May 04 2022 Sandro Mani - 12.0.1-11 +- Rebuild for standard dll provides move to mingw-crt (bootstrap=0) -* Fri Apr 16 2021 Mohan Boddu - 10.2.1-7 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue May 03 2022 Sandro Mani - 12.0.1-10 +- Rebuild for standard dll provides move to mingw-crt (bootstrap=1, enable_libgomp=0) + +* Sun May 01 2022 Thierry Vignaud 12.0.1-9 +- Fix missing requires on *-libgcc whose split broke building packages + linking with -lssp + +* Wed Apr 27 2022 Sandro Mani - 12.0.1-8 +- Bump + +* Wed Apr 27 2022 Sandro Mani - 12.0.1-7 +- Rebuild for mingw-w64-10.0.0 (bootstrap=0, enable_libgomp=1) + +* Tue Apr 26 2022 Sandro Mani - 12.0.1-6 +- Rebuild for mingw-w64-10.0.0 (bootstrap=0, enable_libgomp=0) + +* Tue Apr 26 2022 Sandro Mani - 12.0.1-5 +- Rebuild for mingw-w64-10.0.0 (bootstrap=1, enable_libgomp=0) + +* Tue Apr 26 2022 Sandro Mani - 12.0.1-4 +- Update to 20220413 snapshot +- Move runtime dlls to subpackage + +* Wed Mar 30 2022 Sandro Mani - 12.0.1-3 +- Re-add --enable-threads=posix + +* Tue Mar 29 2022 Sandro Mani - 12.0.1-2 +- Drop --enable-threads=posix, it hardcodes -lpthread in the link flags and + breaks statically linking + +* Fri Mar 25 2022 Sandro Mani - 12.0.1-1 +- Update to 12.0.1 (with bootstrap=0, enable_libgomp=1) + +* Thu Mar 24 2022 Sandro Mani - 12.0.1-0.2 +- Update to 12.0.1 (with bootstrap=0, enable_libgomp=0) + +* Thu Mar 24 2022 Sandro Mani - 12.0.1-0.1 +- Update to 12.0.1 (with bootstrap=1, enable_libgomp=0) + +* Wed Feb 23 2022 Marc-André Lureau - 11.2.1-7 +- Add ucrt64 target (with bootstrap=0, enable_libgomp=1) + +* Wed Feb 23 2022 Marc-André Lureau - 11.2.1-6 +- Add ucrt64 target (with bootstrap=1, enable_libgomp=0) + +* Thu Jan 20 2022 Fedora Release Engineering - 11.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Oct 20 2021 Sandro Mani - 11.2.1-4 +- Update to 11.2.1 20211019 snapshot + +* Fri Jul 30 2021 Sandro Mani - 11.2.1-3 +- Update to 11.2.1 + +* Thu Jul 22 2021 Fedora Release Engineering - 11.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 09 2021 Sandro Mani - 11.1.1-1 +- Update to 11.1.1 (full build) + +* Thu Jul 08 2021 Sandro Mani - 11.1.1-0.2 +- Update to 11.1.1 (bootstrap 2) + +* Thu Jul 08 2021 Sandro Mani - 11.1.1-0.1 +- Update to 11.1.1 (bootstrap) + +* Mon Apr 26 2021 Sandro Mani - 10.3.1-1 +- Update to 10.3.1 * Thu Jan 28 2021 Richard W.M. Jones - 10.2.1-6 - Bump and rebuild for s390. diff --git a/sources b/sources index 2774611..a08691f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gcc-12.1.1-20220507.tar.xz) = 6c978a58820ad24b2aeb03d579782de1b0e76ade509b6f2e38ebd773565d1b9afd968c99b26db399416e7aa8bdd068631bc3d3b7eff3d41e734ca3764337b8e2 +SHA512 (gcc-12.2.1-20220819.tar.xz) = 40464b6c544edd91ea744354a38bb2ec075d021b3bece7997b40b462dbca5a7b86105ae157fa081b1a6bd1c9f4813a51eec245b56a2bd2eb171e90ce048c0f25