summaryrefslogtreecommitdiff
path: root/packages/mingw-w64/v5.0.2
diff options
context:
space:
mode:
Diffstat (limited to 'packages/mingw-w64/v5.0.2')
-rw-r--r--packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch58
-rw-r--r--packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch (renamed from packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch)12
-rw-r--r--packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch (renamed from packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch)10
-rw-r--r--packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch55
4 files changed, 71 insertions, 64 deletions
diff --git a/packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch b/packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch
new file mode 100644
index 0000000..f19e8ce
--- /dev/null
+++ b/packages/mingw-w64/v5.0.2/0000-mingw64-malloc.patch
@@ -0,0 +1,58 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h | 2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c | 3 +++
+ mingw-w64-tools/widl/include/pathtools.h | 3 +--
+ mingw-w64-tools/widl/src/pathtools.c | 3 +--
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+--- a/mingw-w64-tools/genidl/src/genidl_typinfo.c
++++ b/mingw-w64-tools/genidl/src/genidl_typinfo.c
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+
+--- a/mingw-w64-tools/widl/include/pathtools.h
++++ b/mingw-w64-tools/widl/include/pathtools.h
+@@ -12,9 +12,8 @@
+ #define PATHTOOLS_H
+
+ #include <unistd.h>
+-#if defined(__APPLE__)
+ #include <stdlib.h>
+-#else
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
+ #endif
+ #include <stdio.h>
+--- a/mingw-w64-tools/widl/src/pathtools.c
++++ b/mingw-w64-tools/widl/src/pathtools.c
+@@ -8,9 +8,8 @@
+ .email: <mingw.android@gmail.com>.
+ */
+
+-#if defined(__APPLE__)
+ #include <stdlib.h>
+-#else
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
+ #endif
+ #include <limits.h>
diff --git a/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch
index 7cfd511..e4c7780 100644
--- a/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch
@@ -4,11 +4,13 @@ Date: Thu Jun 15 09:50:00 2017 +0300
gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..0c5beaad 100644
+---
+ mingw-w64-tools/gendef/src/gendef.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
--- a/mingw-w64-tools/gendef/src/gendef.c
+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
+@@ -836,7 +836,7 @@
if (!sz || code == c_ill)
{
PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
@@ -17,7 +19,7 @@ index a935abfe..0c5beaad 100644
#if ENABLE_DEBUG == 1
{
unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
+@@ -1031,10 +1031,10 @@
PRDEBUG(" 0x%x illegal ", (unsigned int) b);
#endif
*aCode=c_ill; return 0;
@@ -31,7 +33,7 @@ index a935abfe..0c5beaad 100644
case c_retn: case c_retf:
case c_iret: case c_int3:
case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
+@@ -1061,7 +1061,7 @@
p = (unsigned char *) map_va (pc + sz);
if (!p) { *aCode=c_ill; return 0; }
#if ENABLE_DEBUG == 1
diff --git a/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch
index 927c005..5986aef 100644
--- a/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch
@@ -6,11 +6,13 @@ Date: Thu Jun 15 09:45:52 2017 +0300
after show_usage() to avoid -Wimplicit-fallthrough
(show_usage): mark the function with noreturn attribute.
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..1ebe607d 100644
+---
+ mingw-w64-tools/genpeimg/src/genpeimg.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
--- a/mingw-w64-tools/genpeimg/src/genpeimg.c
+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
+@@ -28,7 +28,7 @@
int dump_information = 0;
static char *file_name = NULL;
@@ -19,7 +21,7 @@ index b2430bbc..1ebe607d 100644
show_usage (void)
{
fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
+@@ -204,6 +204,7 @@
case 'h':
if (h[2] == 0)
show_usage ();
diff --git a/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch b/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch
deleted file mode 100644
index 3d05b63..0000000
--- a/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h 2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c 2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
-
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/include/pathtools.h 2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/widl/include/pathtools.h 2017-03-10 16:26:21.000000000 -0800
-@@ -12,9 +12,8 @@
- #define PATHTOOLS_H
-
- #include <unistd.h>
--#if defined(__APPLE__)
- #include <stdlib.h>
--#else
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
- #endif
- #include <stdio.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/widl/src/pathtools.c 2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/widl/src/pathtools.c 2017-03-10 16:26:40.000000000 -0800
-@@ -8,9 +8,8 @@
- .email: <mingw.android@gmail.com>.
- */
-
--#if defined(__APPLE__)
- #include <stdlib.h>
--#else
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
- #endif
- #include <limits.h>
generated by cgit v0.10.2-6-g49f6 at 2024-06-01 15:09:25 (GMT)