Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>

32 files changed, 484 insertions, 437 deletions

diff --git a/packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch b/packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..c43b89e6
--- /dev/null
+++ b/packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- a/mingw-w64-tools/genidl/src/genidl_cfg.h
++++ b/mingw-w64-tools/genidl/src/genidl_cfg.h
+@@ -51,7 +51,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
+@@ -46,7 +46,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 --git a/packages/mingw-w64/v3.2.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v2.0.10/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..405a6cea 100644
--- a/packages/mingw-w64/v3.2.0/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v2.0.10/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
+@@ -826,7 +826,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:
+@@ -1021,10 +1021,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:
+@@ -1051,7 +1051,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/v2.0.10/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +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 --git a/packages/mingw-w64/v3.0.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.0.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.0.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- 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>
+ 
diff --git a/packages/mingw-w64/v2.0.10/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.0.0/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..0537bab4 100644
--- a/packages/mingw-w64/v2.0.10/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.0.0/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
+@@ -820,7 +820,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:
+@@ -1015,10 +1015,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:
+@@ -1045,7 +1045,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/v3.0.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.0.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.0.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.0.0/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/v3.0.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +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 --git a/packages/mingw-w64/v3.1.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.1.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.1.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- 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>
+ 
diff --git a/packages/mingw-w64/v3.1.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.1.0/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..0537bab4 100644
--- a/packages/mingw-w64/v3.1.0/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.1.0/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
+@@ -820,7 +820,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:
+@@ -1015,10 +1015,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:
+@@ -1045,7 +1045,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/v3.1.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.1.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.1.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.1.0/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/v3.1.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +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 --git a/packages/mingw-w64/v3.2.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.2.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.2.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- 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>
+ 
diff --git a/packages/mingw-w64/v3.0.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.2.0/0001-gendef-explicit-fallthrough.patch
index 7cfd5114..0537bab4 100644
--- a/packages/mingw-w64/v3.0.0/200-gendef-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.2.0/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
+@@ -820,7 +820,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:
+@@ -1015,10 +1015,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:
+@@ -1045,7 +1045,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/v3.2.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.2.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.2.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.2.0/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/v3.2.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +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 --git a/packages/mingw-w64/v3.3.0/0000-mingw64-malloc.patch b/packages/mingw-w64/v3.3.0/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v3.3.0/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- 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>
+ 
diff --git a/packages/mingw-w64/v3.3.0/0001-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.3.0/0001-gendef-explicit-fallthrough.patch
new file mode 100644
index 00000000..0537bab4
--- /dev/null
+++ b/packages/mingw-w64/v3.3.0/0001-gendef-explicit-fallthrough.patch
@@ -0,0 +1,44 @@
+commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:50:00 2017 +0300
+
+    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
+
+---
+ 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
+@@ -820,7 +820,7 @@
+       if (!sz || code == c_ill)
+         {
+           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
+-	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
++		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
+ #if ENABLE_DEBUG == 1
+       {
+         unsigned char *ppc = (unsigned char *) map_va (pc);
+@@ -1015,10 +1015,10 @@
+     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
+ #endif
+     *aCode=c_ill; return 0;
+-  case c_4: sz++;
+-  case c_3: sz++;
++  case c_4: sz++;/* fallthru */
++  case c_3: sz++;/* fallthru */
+   case c_lb:
+-  case c_2: sz++;
++  case c_2: sz++;/* fallthru */
+   case c_retn: case c_retf:
+   case c_iret: case c_int3:
+   case c_ad: case c_op:
+@@ -1045,7 +1045,7 @@
+           p = (unsigned char *) map_va (pc + sz);
+           if (!p) { *aCode=c_ill; return 0; }
+ #if ENABLE_DEBUG == 1
+-    enter_save_insn(lw,p[0]);
++	  enter_save_insn(lw,p[0]);
+ #endif
+           b&=~0x7; b|=(p[0]&7);
+ 	  sz+=1;
diff --git a/packages/mingw-w64/v3.3.0/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v3.3.0/0002-genpeimg-explicit-fallthrough.patch
index 927c0050..5986aefc 100644
--- a/packages/mingw-w64/v3.3.0/300-genpeimg-explicit-fallthrough.patch
+++ b/packages/mingw-w64/v3.3.0/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/v3.3.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +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 --git a/packages/mingw-w64/v3.3.0/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v3.3.0/200-gendef-explicit-fallthrough.patch
deleted file mode 100644
index 7cfd5114..00000000
--- a/packages/mingw-w64/v3.3.0/200-gendef-explicit-fallthrough.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
-Author: sezero <sezero@users.sourceforge.net>
-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
---- 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
-       if (!sz || code == c_ill)
-         {
-           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
--	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
-+		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
- #if ENABLE_DEBUG == 1
-       {
-         unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
-+  case c_4: sz++;/* fallthru */
-+  case c_3: sz++;/* fallthru */
-   case c_lb:
--  case c_2: sz++;
-+  case c_2: sz++;/* fallthru */
-   case c_retn: case c_retf:
-   case c_iret: case c_int3:
-   case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
-           p = (unsigned char *) map_va (pc + sz);
-           if (!p) { *aCode=c_ill; return 0; }
- #if ENABLE_DEBUG == 1
--    enter_save_insn(lw,p[0]);
-+	  enter_save_insn(lw,p[0]);
- #endif
-           b&=~0x7; b|=(p[0]&7);
- 	  sz+=1;
diff --git a/packages/mingw-w64/v4.0.6/0000-mingw64-malloc.patch b/packages/mingw-w64/v4.0.6/0000-mingw64-malloc.patch
new file mode 100644
index 00000000..8e0add1f
--- /dev/null
+++ b/packages/mingw-w64/v4.0.6/0000-mingw64-malloc.patch
@@ -0,0 +1,30 @@
+---
+ mingw-w64-tools/genidl/src/genidl_cfg.h     |    2 ++
+ mingw-w64-tools/genidl/src/genidl_typinfo.c |    3 +++
+ 2 files changed, 5 insertions(+)
+
+--- 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>
+ 
diff --git a/packages/mingw-w64/v4.0.6/0001-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/0001-gendef-explicit-fallthrough.patch
new file mode 100644
index 00000000..7027275b
--- /dev/null
+++ b/packages/mingw-w64/v4.0.6/0001-gendef-explicit-fallthrough.patch
@@ -0,0 +1,44 @@
+commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:50:00 2017 +0300
+
+    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
+
+---
+ 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
+@@ -832,7 +832,7 @@
+       if (!sz || code == c_ill)
+         {
+           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
+-	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
++		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
+ #if ENABLE_DEBUG == 1
+       {
+         unsigned char *ppc = (unsigned char *) map_va (pc);
+@@ -1027,10 +1027,10 @@
+     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
+ #endif
+     *aCode=c_ill; return 0;
+-  case c_4: sz++;
+-  case c_3: sz++;
++  case c_4: sz++;/* fallthru */
++  case c_3: sz++;/* fallthru */
+   case c_lb:
+-  case c_2: sz++;
++  case c_2: sz++;/* fallthru */
+   case c_retn: case c_retf:
+   case c_iret: case c_int3:
+   case c_ad: case c_op:
+@@ -1057,7 +1057,7 @@
+           p = (unsigned char *) map_va (pc + sz);
+           if (!p) { *aCode=c_ill; return 0; }
+ #if ENABLE_DEBUG == 1
+-    enter_save_insn(lw,p[0]);
++	  enter_save_insn(lw,p[0]);
+ #endif
+           b&=~0x7; b|=(p[0]&7);
+ 	  sz+=1;
diff --git a/packages/mingw-w64/v4.0.6/0002-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/0002-genpeimg-explicit-fallthrough.patch
new file mode 100644
index 00000000..5986aefc
--- /dev/null
+++ b/packages/mingw-w64/v4.0.6/0002-genpeimg-explicit-fallthrough.patch
@@ -0,0 +1,31 @@
+commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:45:52 2017 +0300
+
+    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
+     after show_usage() to avoid -Wimplicit-fallthrough
+    (show_usage): mark the function with noreturn attribute.
+
+---
+ 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 @@
+ int dump_information = 0;
+ static char *file_name = NULL;
+ 
+-static void
++static void __attribute__((noreturn))
+ show_usage (void)
+ {
+   fprintf (stderr, "genpeimg [options] files...\n");
+@@ -204,6 +204,7 @@
+ 	case 'h':
+ 	  if (h[2] == 0)
+ 	    show_usage ();
++	  /* fallthru */
+ 	default:
+ error_point:
+ 	  fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61f..00000000
--- a/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +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 --git a/packages/mingw-w64/v4.0.6/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/200-gendef-explicit-fallthrough.patch
deleted file mode 100644
index 7cfd5114..00000000
--- a/packages/mingw-w64/v4.0.6/200-gendef-explicit-fallthrough.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
-Author: sezero <sezero@users.sourceforge.net>
-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
---- 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
-       if (!sz || code == c_ill)
-         {
-           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
--	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
-+		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
- #if ENABLE_DEBUG == 1
-       {
-         unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
-+  case c_4: sz++;/* fallthru */
-+  case c_3: sz++;/* fallthru */
-   case c_lb:
--  case c_2: sz++;
-+  case c_2: sz++;/* fallthru */
-   case c_retn: case c_retf:
-   case c_iret: case c_int3:
-   case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
-           p = (unsigned char *) map_va (pc + sz);
-           if (!p) { *aCode=c_ill; return 0; }
- #if ENABLE_DEBUG == 1
--    enter_save_insn(lw,p[0]);
-+	  enter_save_insn(lw,p[0]);
- #endif
-           b&=~0x7; b|=(p[0]&7);
- 	  sz+=1;
diff --git a/packages/mingw-w64/v4.0.6/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v4.0.6/300-genpeimg-explicit-fallthrough.patch
deleted file mode 100644
index 927c0050..00000000
--- a/packages/mingw-w64/v4.0.6/300-genpeimg-explicit-fallthrough.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
-Author: sezero <sezero@users.sourceforge.net>
-Date:   Thu Jun 15 09:45:52 2017 +0300
-
-    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
-     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
---- 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;
- int dump_information = 0;
- static char *file_name = NULL;
- 
--static void
-+static void __attribute__((noreturn))
- show_usage (void)
- {
-   fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
- 	case 'h':
- 	  if (h[2] == 0)
- 	    show_usage ();
-+	  /* fallthru */
- 	default:
- error_point:
- 	  fprintf (stderr, "Unknown option ,%s'\n", h);
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 00000000..f19e8ce5
--- /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/0001-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch
new file mode 100644
index 00000000..e4c7780d
--- /dev/null
+++ b/packages/mingw-w64/v5.0.2/0001-gendef-explicit-fallthrough.patch
@@ -0,0 +1,44 @@
+commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:50:00 2017 +0300
+
+    gendef.c (getMemonic): add /* fallthru */ comments in the switch to avoid -Wimplicit-fallthrough
+
+---
+ 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 @@
+       if (!sz || code == c_ill)
+         {
+           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
+-	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
++		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
+ #if ENABLE_DEBUG == 1
+       {
+         unsigned char *ppc = (unsigned char *) map_va (pc);
+@@ -1031,10 +1031,10 @@
+     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
+ #endif
+     *aCode=c_ill; return 0;
+-  case c_4: sz++;
+-  case c_3: sz++;
++  case c_4: sz++;/* fallthru */
++  case c_3: sz++;/* fallthru */
+   case c_lb:
+-  case c_2: sz++;
++  case c_2: sz++;/* fallthru */
+   case c_retn: case c_retf:
+   case c_iret: case c_int3:
+   case c_ad: case c_op:
+@@ -1061,7 +1061,7 @@
+           p = (unsigned char *) map_va (pc + sz);
+           if (!p) { *aCode=c_ill; return 0; }
+ #if ENABLE_DEBUG == 1
+-    enter_save_insn(lw,p[0]);
++	  enter_save_insn(lw,p[0]);
+ #endif
+           b&=~0x7; b|=(p[0]&7);
+ 	  sz+=1;
diff --git a/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch
new file mode 100644
index 00000000..5986aefc
--- /dev/null
+++ b/packages/mingw-w64/v5.0.2/0002-genpeimg-explicit-fallthrough.patch
@@ -0,0 +1,31 @@
+commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
+Author: sezero <sezero@users.sourceforge.net>
+Date:   Thu Jun 15 09:45:52 2017 +0300
+
+    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
+     after show_usage() to avoid -Wimplicit-fallthrough
+    (show_usage): mark the function with noreturn attribute.
+
+---
+ 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 @@
+ int dump_information = 0;
+ static char *file_name = NULL;
+ 
+-static void
++static void __attribute__((noreturn))
+ show_usage (void)
+ {
+   fprintf (stderr, "genpeimg [options] files...\n");
+@@ -204,6 +204,7 @@
+ 	case 'h':
+ 	  if (h[2] == 0)
+ 	    show_usage ();
++	  /* fallthru */
+ 	default:
+ error_point:
+ 	  fprintf (stderr, "Unknown option ,%s'\n", h);
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 3d05b63b..00000000
--- 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>
diff --git a/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch
deleted file mode 100644
index 7cfd5114..00000000
--- a/packages/mingw-w64/v5.0.2/200-gendef-explicit-fallthrough.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-commit b4416f9a54ca0f27adc4a5a2d576779ec1288047
-Author: sezero <sezero@users.sourceforge.net>
-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
---- 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
-       if (!sz || code == c_ill)
-         {
-           PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
--	 	  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
-+		  (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
- #if ENABLE_DEBUG == 1
-       {
-         unsigned char *ppc = (unsigned char *) map_va (pc);
-@@ -1031,10 +1031,10 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
-+  case c_4: sz++;/* fallthru */
-+  case c_3: sz++;/* fallthru */
-   case c_lb:
--  case c_2: sz++;
-+  case c_2: sz++;/* fallthru */
-   case c_retn: case c_retf:
-   case c_iret: case c_int3:
-   case c_ad: case c_op:
-@@ -1061,7 +1061,7 @@ redo_switch:
-           p = (unsigned char *) map_va (pc + sz);
-           if (!p) { *aCode=c_ill; return 0; }
- #if ENABLE_DEBUG == 1
--    enter_save_insn(lw,p[0]);
-+	  enter_save_insn(lw,p[0]);
- #endif
-           b&=~0x7; b|=(p[0]&7);
- 	  sz+=1;
diff --git a/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch b/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch
deleted file mode 100644
index 927c0050..00000000
--- a/packages/mingw-w64/v5.0.2/300-genpeimg-explicit-fallthrough.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit f9f2bd0641b89895ab42b1948f431dadf1e837a4
-Author: sezero <sezero@users.sourceforge.net>
-Date:   Thu Jun 15 09:45:52 2017 +0300
-
-    genpeimg.c (pass_args): add a /* fallthru */ comment in the switch
-     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
---- 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;
- int dump_information = 0;
- static char *file_name = NULL;
- 
--static void
-+static void __attribute__((noreturn))
- show_usage (void)
- {
-   fprintf (stderr, "genpeimg [options] files...\n");
-@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
- 	case 'h':
- 	  if (h[2] == 0)
- 	    show_usage ();
-+	  /* fallthru */
- 	default:
- error_point:
- 	  fprintf (stderr, "Unknown option ,%s'\n", h);