mingw-w64: update to 8.0.0

Including a patch for GCC to fix a warning that fails the build[1].

[1] https://www.spinics.net/lists/gcchelp/msg51246.html

2 files changed, 59 insertions, 7 deletions

diff --git a/src/gcc-1-fixes.patch b/src/gcc-1-fixes.patch
index 73c42fe..3996be5 100644
--- a/src/gcc-1-fixes.patch
+++ b/src/gcc-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 2 Feb 2017 02:05:50 +1100
-Subject: [PATCH 1/5] allow native cpu detection when building with clang
+Subject: [PATCH 1/6] allow native cpu detection when building with clang
 
 function was disabled for non-gcc5 in:
 https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@@ -29,7 +29,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Fri, 6 Apr 2018 13:40:22 +1000
-Subject: [PATCH 2/5] remove hard-coded mingw from include path
+Subject: [PATCH 2/6] remove hard-coded mingw from include path
 
 
 diff --git a/gcc/config.gcc b/gcc/config.gcc
@@ -62,7 +62,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cameron Kaiser <classilla@floodgap.com>
 Date: Sat, 13 Oct 2018 18:59:18 -0700
-Subject: [PATCH 3/5] fix gcc compile error on ppc64le
+Subject: [PATCH 3/6] fix gcc compile error on ppc64le
 
 https://gcc.gnu.org/viewcvs/gcc/branches/gcc-6-branch/libcpp/lex.c?view=log&pathrev=261621
 
@@ -83,7 +83,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
 Date: Sun, 11 Nov 2018 17:44:43 +0000
-Subject: [PATCH 4/5] Backport from mainline 2018-11-04 Uros Bizjak
+Subject: [PATCH 4/6] Backport from mainline 2018-11-04 Uros Bizjak
  <ubizjak@gmail.com>
 
 	PR middle-end/58372
@@ -136,7 +136,7 @@ index 1111111..2222222 100644
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Sun, 31 May 2020 18:36:27 +1000
-Subject: [PATCH 5/5] PR c++/66297, DR 1684 - literal class and constexpr
+Subject: [PATCH 5/6] PR c++/66297, DR 1684 - literal class and constexpr
  member fns
 
 taken from:
@@ -204,3 +204,55 @@ index 1111111..2222222 100644
  	}
      }
    else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)))
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Liu Hao <lh_mouse@126.com>
+Date: Wed, 6 May 2020 21:49:18 +0800
+Subject: [PATCH 6/6] libgomp: Don't hard-code MS printf attributes
+
+Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
+
+Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
+
+diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
+index 1111111..2222222 100644
+--- a/libgomp/libgomp.h
++++ b/libgomp/libgomp.h
+@@ -45,6 +45,14 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ 
++#include <stdio.h>
++#include <stdio.h>
++#ifdef __MINGW_PRINTF_FORMAT
++#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
++#else
++#define PRINTF_FORMAT printf
++#endif
++
+ #ifdef HAVE_ATTRIBUTE_VISIBILITY
+ # pragma GCC visibility push(hidden)
+ #endif
+@@ -541,7 +549,7 @@ extern void *gomp_realloc (void *, size_t);
+ 
+ extern void gomp_vdebug (int, const char *, va_list);
+ extern void gomp_debug (int, const char *, ...)
+-	__attribute__ ((format (printf, 2, 3)));
++	__attribute__ ((format (PRINTF_FORMAT, 2, 3)));
+ #define gomp_vdebug(KIND, FMT, VALIST) \
+   do { \
+     if (__builtin_expect (gomp_debug_var, 0)) \
+@@ -554,11 +562,11 @@ extern void gomp_debug (int, const char *, ...)
+   } while (0)
+ extern void gomp_verror (const char *, va_list);
+ extern void gomp_error (const char *, ...)
+-	__attribute__ ((format (printf, 1, 2)));
++	__attribute__ ((format (PRINTF_FORMAT, 1, 2)));
+ extern void gomp_vfatal (const char *, va_list)
+ 	__attribute__ ((noreturn));
+ extern void gomp_fatal (const char *, ...)
+-	__attribute__ ((noreturn, format (printf, 1, 2)));
++	__attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
+ 
+ /* iter.c */
+ 
diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk
index 5a9e5bc..890d935 100644
--- a/src/mingw-w64.mk
+++ b/src/mingw-w64.mk
@@ -4,8 +4,8 @@ PKG             := mingw-w64
 $(PKG)_WEBSITE  := https://mingw-w64.sourceforge.io/
 $(PKG)_DESCR    := MinGW-w64 Runtime
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.0.0
-$(PKG)_CHECKSUM := aa20dfff3596f08a7f427aab74315a6cb80c2b086b4a107ed35af02f9496b628
+$(PKG)_VERSION  := 8.0.0
+$(PKG)_CHECKSUM := 44c740ea6ab3924bc3aa169bad11ad3c5766c5c8459e3126d44eabb8735a5762
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)