From f928d945f604c57b60c5b88729486c28aca794d0 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 10 Mar 2023 17:40:13 +0100 Subject: [PATCH] Update to 13.0.1 --- .gitignore | 1 + ...Don-t-hard-code-MS-printf-attributes.patch | 10 +- mingw-gcc-configure-c99-1.patch | 40 ------- mingw-gcc-configure-c99-2.patch | 111 ------------------ mingw-gcc.spec | 53 ++++----- sources | 2 +- 6 files changed, 27 insertions(+), 190 deletions(-) delete mode 100644 mingw-gcc-configure-c99-1.patch delete mode 100644 mingw-gcc-configure-c99-2.patch diff --git a/.gitignore b/.gitignore index a79d719..3b0be42 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ gcc-4.5.1.tar.bz2 /gcc-12.1.1-20220628.tar.xz /gcc-12.2.1-20220819.tar.xz /gcc-12.2.1-20221121.tar.xz +/gcc-13.0.1-20230304.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 a4c6111..4c64208 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.2.1-20221121/libgomp/libgomp.h gcc-12.2.1-20221121-new/libgomp/libgomp.h ---- gcc-12.2.1-20221121/libgomp/libgomp.h 2022-11-21 10:55:25.000000000 +0100 -+++ gcc-12.2.1-20221121-new/libgomp/libgomp.h 2023-01-04 11:40:12.664254080 +0100 +diff -rupN --no-dereference gcc-13.0.1-20230304/libgomp/libgomp.h gcc-13.0.1-20230304-new/libgomp/libgomp.h +--- gcc-13.0.1-20230304/libgomp/libgomp.h 2023-03-04 19:40:58.000000000 +0100 ++++ gcc-13.0.1-20230304-new/libgomp/libgomp.h 2023-03-10 08:38:15.289652064 +0100 @@ -69,6 +69,13 @@ # endif #endif @@ -15,7 +15,7 @@ diff -rupN --no-dereference gcc-12.2.1-20221121/libgomp/libgomp.h gcc-12.2.1-202 #ifdef HAVE_ATTRIBUTE_VISIBILITY # pragma GCC visibility push(hidden) #endif -@@ -176,7 +183,7 @@ team_free (void *ptr) +@@ -177,7 +184,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.2.1-20221121/libgomp/libgomp.h gcc-12.2.1-202 #define gomp_vdebug(KIND, FMT, VALIST) \ do { \ if (__builtin_expect (gomp_debug_var, 0)) \ -@@ -189,11 +196,11 @@ extern void gomp_debug (int, const char +@@ -190,11 +197,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-configure-c99-1.patch b/mingw-gcc-configure-c99-1.patch deleted file mode 100644 index 82070b9..0000000 --- a/mingw-gcc-configure-c99-1.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 7d7146102365f708a37401c902fce2f4024b546a -Author: Florian Weimer -Date: Wed Jan 4 11:13:17 2023 +0100 - - libsanitizer: Avoid implicit function declaration in configure test - - libsanitizer/ - - * configure.ac (sanitizer_supported): Include for - syscall prototype. - * configure: Regenerate. - - (cherry picked from commit 6be2672e4ee41c566a9e072088cccca263bab5f7) - -diff --git a/libsanitizer/configure b/libsanitizer/configure -index 771b135573a8b031..ae8c1bd7e831e83d 100755 ---- a/libsanitizer/configure -+++ b/libsanitizer/configure -@@ -16028,6 +16028,7 @@ case "$target" in - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - int - main () - { -diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac -index 7f1ef3979c4cb03c..ad49f29db7e04d30 100644 ---- a/libsanitizer/configure.ac -+++ b/libsanitizer/configure.ac -@@ -161,7 +161,8 @@ case "$target" in - *-*-linux*) - # Some old Linux distributions miss required syscalls. - sanitizer_supported=no -- AC_TRY_COMPILE([#include ],[ -+ AC_TRY_COMPILE([#include -+#include ],[ - syscall (__NR_gettid); - syscall (__NR_futex); - syscall (__NR_exit_group); diff --git a/mingw-gcc-configure-c99-2.patch b/mingw-gcc-configure-c99-2.patch deleted file mode 100644 index f1bafe0..0000000 --- a/mingw-gcc-configure-c99-2.patch +++ /dev/null @@ -1,111 +0,0 @@ -commit 63f3eae53683e857818c4bd3d1de719e1310e22a -Author: Florian Weimer -Date: Tue Oct 18 16:58:48 2022 +0200 - - libiberty: Fix C89-isms in configure tests - - libiberty/ - - * acinclude.m4 (ac_cv_func_strncmp_works): Add missing - int return type and parameter list to the definition of main. - Include and for prototypes. - (ac_cv_c_stack_direction): Add missing - int return type and parameter list to the definitions of - main, find_stack_direction. Include for exit - prototype. - * configure: Regenerate. - - (cherry picked from commit 885b6660c17fb91980b5682514ef54668e544b02) - -diff --git a/libiberty/acinclude.m4 b/libiberty/acinclude.m4 -index 6bd127e98268b7ab..6bb690597bfb77c9 100644 ---- a/libiberty/acinclude.m4 -+++ b/libiberty/acinclude.m4 -@@ -24,6 +24,8 @@ AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works, - [AC_TRY_RUN([ - /* Test by Jim Wilson and Kaveh Ghazi. - Check whether strncmp reads past the end of its string parameters. */ -+#include -+#include - #include - - #ifdef HAVE_FCNTL_H -@@ -51,7 +53,8 @@ AC_CACHE_CHECK([for working strncmp], ac_cv_func_strncmp_works, - - #define MAP_LEN 0x10000 - --main () -+int -+main (void) - { - #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE) - char *p; -@@ -157,7 +160,10 @@ if test $ac_cv_os_cray = yes; then - fi - - AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, --[AC_TRY_RUN([find_stack_direction () -+[AC_TRY_RUN([#include -+ -+int -+find_stack_direction (void) - { - static char *addr = 0; - auto char dummy; -@@ -169,7 +175,9 @@ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction, - else - return (&dummy > addr) ? 1 : -1; - } --main () -+ -+int -+main (void) - { - exit (find_stack_direction() < 0); - }], -diff --git a/libiberty/configure b/libiberty/configure -index 0a797255c70c00f6..ca83f89da6d670d3 100755 ---- a/libiberty/configure -+++ b/libiberty/configure -@@ -6780,7 +6780,10 @@ else - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --find_stack_direction () -+#include -+ -+int -+find_stack_direction (void) - { - static char *addr = 0; - auto char dummy; -@@ -6792,7 +6795,9 @@ find_stack_direction () - else - return (&dummy > addr) ? 1 : -1; - } --main () -+ -+int -+main (void) - { - exit (find_stack_direction() < 0); - } -@@ -7617,6 +7622,8 @@ else - - /* Test by Jim Wilson and Kaveh Ghazi. - Check whether strncmp reads past the end of its string parameters. */ -+#include -+#include - #include - - #ifdef HAVE_FCNTL_H -@@ -7644,7 +7651,8 @@ else - - #define MAP_LEN 0x10000 - --main () -+int -+main (void) - { - #if defined(HAVE_MMAP) || defined(HAVE_MMAP_ANYWHERE) - char *p; diff --git a/mingw-gcc.spec b/mingw-gcc.spec index b62e05d..d40c004 100644 --- a/mingw-gcc.spec +++ b/mingw-gcc.spec @@ -7,25 +7,21 @@ # NOTE See mingw-filesystem/README.md for the build steps! %global bootstrap 0 -%if 0%{?rhel} > 8 %global build_isl 0 -%else -%global build_isl 1 -%endif %global isl_version 0.16.1 # Run the testsuite %global enable_tests 0 -%global DATE 20221121 -%global gitrev b3f5a0d53b84ed27cf00cfa2b9c3e2c78935c07d -%global gcc_version 12.2.1 -%global gcc_major 12 +%global DATE 20230304 +%global gitrev 1ae5227bd538f0ad8e5dbda14bde96d1c1db6f55 +%global gcc_version 13.0.1 +%global gcc_major 13 Name: mingw-gcc Version: %{gcc_version} -Release: 7%{?dist} +Release: 1%{?dist} Summary: MinGW Windows cross-compiler (GCC) for C License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions @@ -42,9 +38,6 @@ Source0: %{srcdir}.tar.xz # See https://sourceforge.net/p/mingw-w64/mailman/mingw-w64-public/thread/8fd2fb03-9b8a-07e1-e162-0bb48bcc3984%40gmail.com/#msg37200751 Patch0: 0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch -# Upstream patches for better C99 compatibility of configure scripts -Patch1: mingw-gcc-configure-c99-1.patch -Patch2: mingw-gcc-configure-c99-2.patch BuildRequires: gcc-c++ BuildRequires: make @@ -566,13 +559,9 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %{_bindir}/%{mingw32_target}-gcov-dump %{_bindir}/%{mingw32_target}-gcov-tool %dir %{_prefix}/lib/gcc/%{mingw32_target}/%{version} -%dir %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include-fixed -%dir %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include -%dir %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/install-tools -%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include-fixed/README -%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include-fixed/*.h -%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/*.h -%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/install-tools/* +%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include/ +%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/include-fixed/ +%{_prefix}/lib/gcc/%{mingw32_target}/%{version}/install-tools/ %{_libexecdir}/gcc/%{mingw32_target}/%{version}/collect2 %{_libexecdir}/gcc/%{mingw32_target}/%{version}/lto-wrapper %{_libexecdir}/gcc/%{mingw32_target}/%{version}/install-tools @@ -591,6 +580,7 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %{mingw32_libdir}/libssp.dll.a %{mingw32_libdir}/libssp_nonshared.a %{mingw32_libdir}/libstdc++fs.a +%{mingw32_libdir}/libstdc++exp.a %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/crtbegin.o %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/crtend.o %{_prefix}/lib/gcc/%{mingw32_target}/%{version}/crtfastmath.o @@ -616,13 +606,9 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %{_bindir}/%{mingw64_target}-gcov-dump %{_bindir}/%{mingw64_target}-gcov-tool %dir %{_prefix}/lib/gcc/%{mingw64_target}/%{version} -%dir %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include-fixed -%dir %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include -%dir %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/install-tools -%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include-fixed/README -%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include-fixed/*.h -%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/*.h -%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/install-tools/* +%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include/ +%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/include-fixed/ +%{_prefix}/lib/gcc/%{mingw64_target}/%{version}/install-tools/ %{_libexecdir}/gcc/%{mingw64_target}/%{version}/collect2 %{_libexecdir}/gcc/%{mingw64_target}/%{version}/lto-wrapper %{_libexecdir}/gcc/%{mingw64_target}/%{version}/install-tools @@ -641,6 +627,7 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %{mingw64_libdir}/libssp.dll.a %{mingw64_libdir}/libssp_nonshared.a %{mingw64_libdir}/libstdc++fs.a +%{mingw64_libdir}/libstdc++exp.a %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/crtbegin.o %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/crtend.o %{_prefix}/lib/gcc/%{mingw64_target}/%{version}/crtfastmath.o @@ -666,13 +653,9 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %{_bindir}/%{ucrt64_target}-gcov-dump %{_bindir}/%{ucrt64_target}-gcov-tool %dir %{_prefix}/lib/gcc/%{ucrt64_target}/%{version} -%dir %{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/include-fixed -%dir %{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/include -%dir %{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/install-tools -%{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/include-fixed/README -%{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/include-fixed/*.h -%{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/include/*.h -%{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/install-tools/* +%{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/include/ +%{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/include-fixed/ +%{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/install-tools/ %{_libexecdir}/gcc/%{ucrt64_target}/%{version}/collect2 %{_libexecdir}/gcc/%{ucrt64_target}/%{version}/lto-wrapper %{_libexecdir}/gcc/%{ucrt64_target}/%{version}/install-tools @@ -691,6 +674,7 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %{ucrt64_libdir}/libssp.dll.a %{ucrt64_libdir}/libssp_nonshared.a %{ucrt64_libdir}/libstdc++fs.a +%{ucrt64_libdir}/libstdc++exp.a %{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/crtbegin.o %{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/crtend.o %{_prefix}/lib/gcc/%{ucrt64_target}/%{version}/crtfastmath.o @@ -904,6 +888,9 @@ ln -sf %{ucrt64_bindir}/libssp-0.dll %{buildroot}%{ucrt64_libdir}/libssp.dll.a %changelog +* Thu Mar 09 2023 Sandro Mani - 13.0.1-1 +- Update to 13.0.1 + * Thu Jan 19 2023 Fedora Release Engineering - 12.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index dcd995a..4046599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gcc-12.2.1-20221121.tar.xz) = 6fef1438e77d8b7e7aeddea6d2d6a82c37d2e93f65ad9007f04206e1a368dd70597cef01188de4ee9bbfe1811a129303ce10b49cb9758a2b44abe4f0312d073a +SHA512 (gcc-13.0.1-20230304.tar.xz) = b9b21080f17737a3f9cbb2b6f152dbf538edc1f011859162586ad034fe48437b26b02bb9978f390d37600c3b035650aed7b6adb72605ea74c61d3615d2669ade