History

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

Orgad Shaneh committed 6 years ago

Commit 151f5501 parent 64777af8 files · +372 −21Browse files

Unified · Split

8 files
  1. plugins/gcc10/gcc10.patch +54 −2
  2. plugins/gcc4/gcc4.patch +41 −2
  3. plugins/gcc6/gcc6.patch +56 −4
  4. plugins/gcc7/gcc7.patch +54 −2
  5. plugins/gcc8/gcc8.patch +54 −2
  6. plugins/gcc9/gcc9.patch +54 −2
  7. src/gcc-1-fixes.patch +57 −5
  8. src/mingw-w64.mk +2 −2
plugins/gcc10/gcc10.patch+54−2
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. · 4 unmodified lines
5From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 20015From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6From: Tony Theodore <tonyt@logyst.com>6From: Tony Theodore <tonyt@logyst.com>
7Date: Sun, 10 May 2020 15:06:47 +10007Date: Sun, 10 May 2020 15:06:47 +1000
8Subject: [PATCH 1/2] allow native cpu detection when building with clang8Subject: [PATCH 1/3] allow native cpu detection when building with clang
9 9
10function was disabled for non-gcc5 in:10function was disabled for non-gcc5 in:
11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@@ -29,7 +29,7 @@ index 1111111..2222222 100644 · 17 unmodified lines
29From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200129From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
30From: Tony Theodore <tonyt@logyst.com>30From: Tony Theodore <tonyt@logyst.com>
31Date: Sun, 10 May 2020 15:09:58 +100031Date: Sun, 10 May 2020 15:09:58 +1000
32Subject: [PATCH 2/2] remove hard-coded mingw from paths32Subject: [PATCH 2/3] remove hard-coded mingw from paths
33 33
34 34
35diff --git a/gcc/config.gcc b/gcc/config.gcc35diff --git a/gcc/config.gcc b/gcc/config.gcc
@@ -67,3 +67,55 @@ index 1111111..2222222 100644 · 31 unmodified lines
67 67
68 /* Output STRING, a string representing a filename, to FILE.68 /* Output STRING, a string representing a filename, to FILE.
69 We canonicalize it to be in Unix format (backslashes are replaced69 We canonicalize it to be in Unix format (backslashes are replaced
70
71From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
72From: Liu Hao <lh_mouse@126.com>
73Date: Wed, 6 May 2020 21:49:18 +0800
74Subject: [PATCH 3/3] libgomp: Don't hard-code MS printf attributes
75
76Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
77
78Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
79
80diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
81index 1111111..2222222 100644
82--- a/libgomp/libgomp.h
83+++ b/libgomp/libgomp.h
84@@ -69,6 +69,14 @@
85 # endif
86 #endif
87
88+#include <stdio.h>
89+#include <stdio.h>
90+#ifdef __MINGW_PRINTF_FORMAT
91+#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
92+#else
93+#define PRINTF_FORMAT printf
94+#endif
95+
96 #ifdef HAVE_ATTRIBUTE_VISIBILITY
97 # pragma GCC visibility push(hidden)
98 #endif
99@@ -173,7 +181,7 @@ team_free (void *ptr)
100
101 extern void gomp_vdebug (int, const char *, va_list);
102 extern void gomp_debug (int, const char *, ...)
103- __attribute__ ((format (printf, 2, 3)));
104+ __attribute__ ((format (PRINTF_FORMAT, 2, 3)));
105 #define gomp_vdebug(KIND, FMT, VALIST) \
106 do { \
107 if (__builtin_expect (gomp_debug_var, 0)) \
108@@ -186,11 +194,11 @@ extern void gomp_debug (int, const char
109 } while (0)
110 extern void gomp_verror (const char *, va_list);
111 extern void gomp_error (const char *, ...)
112- __attribute__ ((format (printf, 1, 2)));
113+ __attribute__ ((format (PRINTF_FORMAT, 1, 2)));
114 extern void gomp_vfatal (const char *, va_list)
115 __attribute__ ((noreturn));
116 extern void gomp_fatal (const char *, ...)
117- __attribute__ ((noreturn, format (printf, 1, 2)));
118+ __attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
119
120 struct gomp_task;
121 struct gomp_taskgroup;
plugins/gcc4/gcc4.patch+41−2
@@ -3,7 +3,7 @@ This file is part of MXE. See LICENSE.md for licensing information. · 2 unmodified lines
3From 05788ad7e6bf16402aa7c9c085784c3582de425c Mon Sep 17 00:00:00 20013From 05788ad7e6bf16402aa7c9c085784c3582de425c Mon Sep 17 00:00:00 2001
4From: Mark Brand <mabrand@mabrand.nl>4From: Mark Brand <mabrand@mabrand.nl>
5Date: Thu, 30 Jul 2015 10:00:49 +02005Date: Thu, 30 Jul 2015 10:00:49 +0200
6Subject: [PATCH 1/2] mingw-float6Subject: [PATCH 1/3] mingw-float
7 7
8This patch has been taken from:8This patch has been taken from:
9https://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html9https://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
@@ -38,7 +38,7 @@ index 805b84d..b9dcc48 100644 · 28 unmodified lines
38From b5497062665c4f4e2a9e10f6ec44817f845ebe17 Mon Sep 17 00:00:00 200138From b5497062665c4f4e2a9e10f6ec44817f845ebe17 Mon Sep 17 00:00:00 2001
39From: Ilya Goncharov <zenbooster@gmail.com>39From: Ilya Goncharov <zenbooster@gmail.com>
40Date: Thu, 30 Jul 2015 10:04:07 +020040Date: Thu, 30 Jul 2015 10:04:07 +0200
41Subject: [PATCH 2/2] intrinsics41Subject: [PATCH 2/3] intrinsics
42 42
43This patch has been taken from:43This patch has been taken from:
44https://gcc.gnu.org/bugzilla/show_bug.cgi?id=5603844https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56038
@@ -882,3 +882,42 @@ index 026e60b..6a78c42 100644 · 837 unmodified lines
882-- 882--
8832.1.48832.1.4
884 884
885From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
886From: Liu Hao <lh_mouse@126.com>
887Date: Wed, 6 May 2020 21:49:18 +0800
888Subject: [PATCH 3/3] libgomp: Don't hard-code MS printf attributes
889
890Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
891
892Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
893
894diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
895index 1111111..2222222 100644
896--- a/libgomp/libgomp.h
897+++ b/libgomp/libgomp.h
898@@ -41,6 +41,13 @@
899 #include <stdbool.h>
900 #include <stdlib.h>
901
902+#include <stdio.h>
903+#ifdef __MINGW_PRINTF_FORMAT
904+#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
905+#else
906+#define PRINTF_FORMAT printf
907+#endif
908+
909 #ifdef HAVE_ATTRIBUTE_VISIBILITY
910 # pragma GCC visibility push(hidden)
911 #endif
912@@ -533,9 +540,9 @@
913 /* error.c */
914
915 extern void gomp_error (const char *, ...)
916- __attribute__((format (printf, 1, 2)));
917+ __attribute__((format (PRINTF_FORMAT, 1, 2)));
918 extern void gomp_fatal (const char *, ...)
919- __attribute__((noreturn, format (printf, 1, 2)));
920+ __attribute__((noreturn, format (PRINTF_FORMAT, 1, 2)));
921
922 /* iter.c */
923
plugins/gcc6/gcc6.patch+56−4
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. · 4 unmodified lines
5From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 20015From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6From: Tony Theodore <tonyt@logyst.com>6From: Tony Theodore <tonyt@logyst.com>
7Date: Thu, 2 Feb 2017 02:05:50 +11007Date: Thu, 2 Feb 2017 02:05:50 +1100
8Subject: [PATCH 1/4] allow native cpu detection when building with clang8Subject: [PATCH 1/5] allow native cpu detection when building with clang
9 9
10function was disabled for non-gcc5 in:10function was disabled for non-gcc5 in:
11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@@ -29,7 +29,7 @@ index 1111111..2222222 100644 · 17 unmodified lines
29From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200129From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
30From: Tony Theodore <tonyt@logyst.com>30From: Tony Theodore <tonyt@logyst.com>
31Date: Fri, 6 Apr 2018 13:40:22 +100031Date: Fri, 6 Apr 2018 13:40:22 +1000
32Subject: [PATCH 2/4] remove hard-coded mingw from include path32Subject: [PATCH 2/5] remove hard-coded mingw from include path
33 33
34 34
35diff --git a/gcc/config.gcc b/gcc/config.gcc35diff --git a/gcc/config.gcc b/gcc/config.gcc
@@ -62,7 +62,7 @@ index 1111111..2222222 100644 · 26 unmodified lines
62From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200162From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
63From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>63From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
64Date: Sun, 11 Nov 2018 17:44:43 +000064Date: Sun, 11 Nov 2018 17:44:43 +0000
65Subject: [PATCH 3/4] Backport from mainline 2018-11-04 Uros Bizjak65Subject: [PATCH 3/5] Backport from mainline 2018-11-04 Uros Bizjak
66 <ubizjak@gmail.com>66 <ubizjak@gmail.com>
67 67
68 PR middle-end/5837268 PR middle-end/58372
@@ -115,7 +115,7 @@ index 1111111..2222222 100644 · 46 unmodified lines
115From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001115From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
116From: Tony Theodore <tonyt@logyst.com>116From: Tony Theodore <tonyt@logyst.com>
117Date: Sun, 31 May 2020 18:36:27 +1000117Date: Sun, 31 May 2020 18:36:27 +1000
118Subject: [PATCH 4/4] PR c++/66297, DR 1684 - literal class and constexpr118Subject: [PATCH 4/5] PR c++/66297, DR 1684 - literal class and constexpr
119 member fns119 member fns
120 120
121taken from:121taken from:
@@ -183,3 +183,55 @@ index 1111111..2222222 100644 · 61 unmodified lines
183 }183 }
184 }184 }
185 else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)))185 else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)))
186
187From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
188From: Liu Hao <lh_mouse@126.com>
189Date: Wed, 6 May 2020 21:49:18 +0800
190Subject: [PATCH 5/5] libgomp: Don't hard-code MS printf attributes
191
192Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
193
194Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
195
196diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
197index 1111111..2222222 100644
198--- a/libgomp/libgomp.h
199+++ b/libgomp/libgomp.h
200@@ -66,6 +66,14 @@
201 # endif
202 #endif
203
204+#include <stdio.h>
205+#include <stdio.h>
206+#ifdef __MINGW_PRINTF_FORMAT
207+#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
208+#else
209+#define PRINTF_FORMAT printf
210+#endif
211+
212 #ifdef HAVE_ATTRIBUTE_VISIBILITY
213 # pragma GCC visibility push(hidden)
214 #endif
215@@ -95,7 +103,7 @@ extern void *gomp_realloc (void *, size_
216
217 extern void gomp_vdebug (int, const char *, va_list);
218 extern void gomp_debug (int, const char *, ...)
219- __attribute__ ((format (printf, 2, 3)));
220+ __attribute__ ((format (PRINTF_FORMAT, 2, 3)));
221 #define gomp_vdebug(KIND, FMT, VALIST) \
222 do { \
223 if (__builtin_expect (gomp_debug_var, 0)) \
224@@ -108,11 +116,11 @@ extern void gomp_debug (int, const char
225 } while (0)
226 extern void gomp_verror (const char *, va_list);
227 extern void gomp_error (const char *, ...)
228- __attribute__ ((format (printf, 1, 2)));
229+ __attribute__ ((format (PRINTF_FORMAT, 1, 2)));
230 extern void gomp_vfatal (const char *, va_list)
231 __attribute__ ((noreturn));
232 extern void gomp_fatal (const char *, ...)
233- __attribute__ ((noreturn, format (printf, 1, 2)));
234+ __attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
235
236 struct gomp_task;
237 struct gomp_taskgroup;
plugins/gcc7/gcc7.patch+54−2
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. · 4 unmodified lines
5From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 20015From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6From: Tony Theodore <tonyt@logyst.com>6From: Tony Theodore <tonyt@logyst.com>
7Date: Thu, 2 Feb 2017 02:05:50 +11007Date: Thu, 2 Feb 2017 02:05:50 +1100
8Subject: [PATCH 1/2] allow native cpu detection when building with clang8Subject: [PATCH 1/3] allow native cpu detection when building with clang
9 9
10function was disabled for non-gcc5 in:10function was disabled for non-gcc5 in:
11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@@ -29,7 +29,7 @@ index 1111111..2222222 100644 · 17 unmodified lines
29From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200129From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
30From: Tony Theodore <tonyt@logyst.com>30From: Tony Theodore <tonyt@logyst.com>
31Date: Fri, 6 Apr 2018 13:40:22 +100031Date: Fri, 6 Apr 2018 13:40:22 +1000
32Subject: [PATCH 2/2] remove hard-coded mingw from include path32Subject: [PATCH 2/3] remove hard-coded mingw from include path
33 33
34 34
35diff --git a/gcc/config.gcc b/gcc/config.gcc35diff --git a/gcc/config.gcc b/gcc/config.gcc
@@ -58,3 +58,55 @@ index 1111111..2222222 100644 · 22 unmodified lines
58 58
59 /* Output STRING, a string representing a filename, to FILE.59 /* Output STRING, a string representing a filename, to FILE.
60 We canonicalize it to be in Unix format (backslashes are replaced60 We canonicalize it to be in Unix format (backslashes are replaced
61
62From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
63From: Liu Hao <lh_mouse@126.com>
64Date: Wed, 6 May 2020 21:49:18 +0800
65Subject: [PATCH 3/3] libgomp: Don't hard-code MS printf attributes
66
67Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
68
69Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
70
71diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
72index 1111111..2222222 100644
73--- a/libgomp/libgomp.h
74+++ b/libgomp/libgomp.h
75@@ -68,6 +68,14 @@
76 # endif
77 #endif
78
79+#include <stdio.h>
80+#include <stdio.h>
81+#ifdef __MINGW_PRINTF_FORMAT
82+#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
83+#else
84+#define PRINTF_FORMAT printf
85+#endif
86+
87 #ifdef HAVE_ATTRIBUTE_VISIBILITY
88 # pragma GCC visibility push(hidden)
89 #endif
90@@ -97,7 +105,7 @@ extern void *gomp_realloc (void *, size_
91
92 extern void gomp_vdebug (int, const char *, va_list);
93 extern void gomp_debug (int, const char *, ...)
94- __attribute__ ((format (printf, 2, 3)));
95+ __attribute__ ((format (PRINTF_FORMAT, 2, 3)));
96 #define gomp_vdebug(KIND, FMT, VALIST) \
97 do { \
98 if (__builtin_expect (gomp_debug_var, 0)) \
99@@ -110,11 +118,11 @@ extern void gomp_debug (int, const char
100 } while (0)
101 extern void gomp_verror (const char *, va_list);
102 extern void gomp_error (const char *, ...)
103- __attribute__ ((format (printf, 1, 2)));
104+ __attribute__ ((format (PRINTF_FORMAT, 1, 2)));
105 extern void gomp_vfatal (const char *, va_list)
106 __attribute__ ((noreturn));
107 extern void gomp_fatal (const char *, ...)
108- __attribute__ ((noreturn, format (printf, 1, 2)));
109+ __attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
110
111 struct gomp_task;
112 struct gomp_taskgroup;
plugins/gcc8/gcc8.patch+54−2
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. · 4 unmodified lines
5From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 20015From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6From: Tony Theodore <tonyt@logyst.com>6From: Tony Theodore <tonyt@logyst.com>
7Date: Thu, 2 Feb 2017 02:05:50 +11007Date: Thu, 2 Feb 2017 02:05:50 +1100
8Subject: [PATCH 1/2] allow native cpu detection when building with clang8Subject: [PATCH 1/3] allow native cpu detection when building with clang
9 9
10function was disabled for non-gcc5 in:10function was disabled for non-gcc5 in:
11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@@ -29,7 +29,7 @@ index 1111111..2222222 100644 · 17 unmodified lines
29From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200129From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
30From: Tony Theodore <tonyt@logyst.com>30From: Tony Theodore <tonyt@logyst.com>
31Date: Fri, 6 Apr 2018 13:40:22 +100031Date: Fri, 6 Apr 2018 13:40:22 +1000
32Subject: [PATCH 2/2] remove hard-coded mingw from include path32Subject: [PATCH 2/3] remove hard-coded mingw from include path
33 33
34 34
35diff --git a/gcc/config.gcc b/gcc/config.gcc35diff --git a/gcc/config.gcc b/gcc/config.gcc
@@ -59,3 +59,55 @@ index 1111111..2222222 100644 · 23 unmodified lines
59 /* Output STRING, a string representing a filename, to FILE.59 /* Output STRING, a string representing a filename, to FILE.
60 We canonicalize it to be in Unix format (backslashes are replaced60 We canonicalize it to be in Unix format (backslashes are replaced
61 61
62
63From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
64From: Liu Hao <lh_mouse@126.com>
65Date: Wed, 6 May 2020 21:49:18 +0800
66Subject: [PATCH 3/3] libgomp: Don't hard-code MS printf attributes
67
68Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
69
70Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
71
72diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
73index 1111111..2222222 100644
74--- a/libgomp/libgomp.h
75+++ b/libgomp/libgomp.h
76@@ -68,6 +68,14 @@
77 # endif
78 #endif
79
80+#include <stdio.h>
81+#include <stdio.h>
82+#ifdef __MINGW_PRINTF_FORMAT
83+#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
84+#else
85+#define PRINTF_FORMAT printf
86+#endif
87+
88 #ifdef HAVE_ATTRIBUTE_VISIBILITY
89 # pragma GCC visibility push(hidden)
90 #endif
91@@ -97,7 +105,7 @@ extern void *gomp_realloc (void *, size_
92
93 extern void gomp_vdebug (int, const char *, va_list);
94 extern void gomp_debug (int, const char *, ...)
95- __attribute__ ((format (printf, 2, 3)));
96+ __attribute__ ((format (PRINTF_FORMAT, 2, 3)));
97 #define gomp_vdebug(KIND, FMT, VALIST) \
98 do { \
99 if (__builtin_expect (gomp_debug_var, 0)) \
100@@ -110,11 +118,11 @@ extern void gomp_debug (int, const char
101 } while (0)
102 extern void gomp_verror (const char *, va_list);
103 extern void gomp_error (const char *, ...)
104- __attribute__ ((format (printf, 1, 2)));
105+ __attribute__ ((format (PRINTF_FORMAT, 1, 2)));
106 extern void gomp_vfatal (const char *, va_list)
107 __attribute__ ((noreturn));
108 extern void gomp_fatal (const char *, ...)
109- __attribute__ ((noreturn, format (printf, 1, 2)));
110+ __attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
111
112 struct gomp_task;
113 struct gomp_taskgroup;
plugins/gcc9/gcc9.patch+54−2
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. · 4 unmodified lines
5From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 20015From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6From: Tony Theodore <tonyt@logyst.com>6From: Tony Theodore <tonyt@logyst.com>
7Date: Thu, 2 Feb 2017 02:05:50 +11007Date: Thu, 2 Feb 2017 02:05:50 +1100
8Subject: [PATCH 1/2] allow native cpu detection when building with clang8Subject: [PATCH 1/3] allow native cpu detection when building with clang
9 9
10function was disabled for non-gcc5 in:10function was disabled for non-gcc5 in:
11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@@ -29,7 +29,7 @@ index 1111111..2222222 100644 · 17 unmodified lines
29From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200129From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
30From: Tony Theodore <tonyt@logyst.com>30From: Tony Theodore <tonyt@logyst.com>
31Date: Fri, 6 Apr 2018 13:40:22 +100031Date: Fri, 6 Apr 2018 13:40:22 +1000
32Subject: [PATCH 2/2] remove hard-coded mingw from include path32Subject: [PATCH 2/3] remove hard-coded mingw from include path
33 33
34 34
35diff --git a/gcc/config.gcc b/gcc/config.gcc35diff --git a/gcc/config.gcc b/gcc/config.gcc
@@ -58,3 +58,55 @@ index 1111111..2222222 100644 · 22 unmodified lines
58 58
59 /* Output STRING, a string representing a filename, to FILE.59 /* Output STRING, a string representing a filename, to FILE.
60 We canonicalize it to be in Unix format (backslashes are replaced60 We canonicalize it to be in Unix format (backslashes are replaced
61
62From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
63From: Liu Hao <lh_mouse@126.com>
64Date: Wed, 6 May 2020 21:49:18 +0800
65Subject: [PATCH 3/3] libgomp: Don't hard-code MS printf attributes
66
67Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
68
69Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
70
71diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
72index 1111111..2222222 100644
73--- a/libgomp/libgomp.h
74+++ b/libgomp/libgomp.h
75@@ -69,6 +69,14 @@
76 # endif
77 #endif
78
79+#include <stdio.h>
80+#include <stdio.h>
81+#ifdef __MINGW_PRINTF_FORMAT
82+#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
83+#else
84+#define PRINTF_FORMAT printf
85+#endif
86+
87 #ifdef HAVE_ATTRIBUTE_VISIBILITY
88 # pragma GCC visibility push(hidden)
89 #endif
90@@ -110,7 +118,7 @@ extern void gomp_aligned_free (void *);
91
92 extern void gomp_vdebug (int, const char *, va_list);
93 extern void gomp_debug (int, const char *, ...)
94- __attribute__ ((format (printf, 2, 3)));
95+ __attribute__ ((format (PRINTF_FORMAT, 2, 3)));
96 #define gomp_vdebug(KIND, FMT, VALIST) \
97 do { \
98 if (__builtin_expect (gomp_debug_var, 0)) \
99@@ -123,11 +131,11 @@ extern void gomp_debug (int, const char
100 } while (0)
101 extern void gomp_verror (const char *, va_list);
102 extern void gomp_error (const char *, ...)
103- __attribute__ ((format (printf, 1, 2)));
104+ __attribute__ ((format (PRINTF_FORMAT, 1, 2)));
105 extern void gomp_vfatal (const char *, va_list)
106 __attribute__ ((noreturn));
107 extern void gomp_fatal (const char *, ...)
108- __attribute__ ((noreturn, format (printf, 1, 2)));
109+ __attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
110
111 struct gomp_task;
112 struct gomp_taskgroup;
src/gcc-1-fixes.patch+57−5
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. · 4 unmodified lines
5From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 20015From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
6From: Tony Theodore <tonyt@logyst.com>6From: Tony Theodore <tonyt@logyst.com>
7Date: Thu, 2 Feb 2017 02:05:50 +11007Date: Thu, 2 Feb 2017 02:05:50 +1100
8Subject: [PATCH 1/5] allow native cpu detection when building with clang8Subject: [PATCH 1/6] allow native cpu detection when building with clang
9 9
10function was disabled for non-gcc5 in:10function was disabled for non-gcc5 in:
11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc11https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=b587c12551143c14f023860a1dbdf7316ae71f27;hp=43096b526a9f23008b9769372f11475ae63487bc
@@ -29,7 +29,7 @@ index 1111111..2222222 100644 · 17 unmodified lines
29From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200129From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
30From: Tony Theodore <tonyt@logyst.com>30From: Tony Theodore <tonyt@logyst.com>
31Date: Fri, 6 Apr 2018 13:40:22 +100031Date: Fri, 6 Apr 2018 13:40:22 +1000
32Subject: [PATCH 2/5] remove hard-coded mingw from include path32Subject: [PATCH 2/6] remove hard-coded mingw from include path
33 33
34 34
35diff --git a/gcc/config.gcc b/gcc/config.gcc35diff --git a/gcc/config.gcc b/gcc/config.gcc
@@ -62,7 +62,7 @@ index 1111111..2222222 100644 · 26 unmodified lines
62From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200162From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
63From: Cameron Kaiser <classilla@floodgap.com>63From: Cameron Kaiser <classilla@floodgap.com>
64Date: Sat, 13 Oct 2018 18:59:18 -070064Date: Sat, 13 Oct 2018 18:59:18 -0700
65Subject: [PATCH 3/5] fix gcc compile error on ppc64le65Subject: [PATCH 3/6] fix gcc compile error on ppc64le
66 66
67https://gcc.gnu.org/viewcvs/gcc/branches/gcc-6-branch/libcpp/lex.c?view=log&pathrev=26162167https://gcc.gnu.org/viewcvs/gcc/branches/gcc-6-branch/libcpp/lex.c?view=log&pathrev=261621
68 68
@@ -83,7 +83,7 @@ index 1111111..2222222 100644 · 14 unmodified lines
83From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 200183From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
84From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>84From: uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
85Date: Sun, 11 Nov 2018 17:44:43 +000085Date: Sun, 11 Nov 2018 17:44:43 +0000
86Subject: [PATCH 4/5] Backport from mainline 2018-11-04 Uros Bizjak86Subject: [PATCH 4/6] Backport from mainline 2018-11-04 Uros Bizjak
87 <ubizjak@gmail.com>87 <ubizjak@gmail.com>
88 88
89 PR middle-end/5837289 PR middle-end/58372
@@ -136,7 +136,7 @@ index 1111111..2222222 100644 · 46 unmodified lines
136From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001136From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
137From: Tony Theodore <tonyt@logyst.com>137From: Tony Theodore <tonyt@logyst.com>
138Date: Sun, 31 May 2020 18:36:27 +1000138Date: Sun, 31 May 2020 18:36:27 +1000
139Subject: [PATCH 5/5] PR c++/66297, DR 1684 - literal class and constexpr139Subject: [PATCH 5/6] PR c++/66297, DR 1684 - literal class and constexpr
140 member fns140 member fns
141 141
142taken from:142taken from:
@@ -204,3 +204,55 @@ index 1111111..2222222 100644 · 61 unmodified lines
204 }204 }
205 }205 }
206 else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)))206 else if (CLASSTYPE_VBASECLASSES (DECL_CONTEXT (fun)))
207
208From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
209From: Liu Hao <lh_mouse@126.com>
210Date: Wed, 6 May 2020 21:49:18 +0800
211Subject: [PATCH 6/6] libgomp: Don't hard-code MS printf attributes
212
213Source: https://github.com/msys2/MINGW-packages/blob/9501ee2afc8d01dc7d85383e4b22e91c30d93ca7/mingw-w64-gcc/0020-libgomp-Don-t-hard-code-MS-printf-attributes.patch
214
215Following discussion at https://www.spinics.net/lists/gcchelp/msg51246.html
216
217diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h
218index 1111111..2222222 100644
219--- a/libgomp/libgomp.h
220+++ b/libgomp/libgomp.h
221@@ -45,6 +45,14 @@
222 #include <stdlib.h>
223 #include <stdarg.h>
224
225+#include <stdio.h>
226+#include <stdio.h>
227+#ifdef __MINGW_PRINTF_FORMAT
228+#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
229+#else
230+#define PRINTF_FORMAT printf
231+#endif
232+
233 #ifdef HAVE_ATTRIBUTE_VISIBILITY
234 # pragma GCC visibility push(hidden)
235 #endif
236@@ -541,7 +549,7 @@ extern void *gomp_realloc (void *, size_t);
237
238 extern void gomp_vdebug (int, const char *, va_list);
239 extern void gomp_debug (int, const char *, ...)
240- __attribute__ ((format (printf, 2, 3)));
241+ __attribute__ ((format (PRINTF_FORMAT, 2, 3)));
242 #define gomp_vdebug(KIND, FMT, VALIST) \
243 do { \
244 if (__builtin_expect (gomp_debug_var, 0)) \
245@@ -554,11 +562,11 @@ extern void gomp_debug (int, const char *, ...)
246 } while (0)
247 extern void gomp_verror (const char *, va_list);
248 extern void gomp_error (const char *, ...)
249- __attribute__ ((format (printf, 1, 2)));
250+ __attribute__ ((format (PRINTF_FORMAT, 1, 2)));
251 extern void gomp_vfatal (const char *, va_list)
252 __attribute__ ((noreturn));
253 extern void gomp_fatal (const char *, ...)
254- __attribute__ ((noreturn, format (printf, 1, 2)));
255+ __attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
256
257 /* iter.c */
258
src/mingw-w64.mk+2−2
@@ -4,8 +4,8 @@ PKG := mingw-w64 · 3 unmodified lines
4$(PKG)_WEBSITE := https://mingw-w64.sourceforge.io/4$(PKG)_WEBSITE := https://mingw-w64.sourceforge.io/
5$(PKG)_DESCR := MinGW-w64 Runtime5$(PKG)_DESCR := MinGW-w64 Runtime
6$(PKG)_IGNORE :=6$(PKG)_IGNORE :=
7$(PKG)_VERSION := 7.0.07$(PKG)_VERSION := 8.0.0
8$(PKG)_CHECKSUM := aa20dfff3596f08a7f427aab74315a6cb80c2b086b4a107ed35af02f9496b6288$(PKG)_CHECKSUM := 44c740ea6ab3924bc3aa169bad11ad3c5766c5c8459e3126d44eabb8735a5762
9$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION)9$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION)
10$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz210$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2
11$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)11$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t