diff options
Diffstat (limited to 'packages/mingw-w64/v2.0.10')
-rw-r--r-- | packages/mingw-w64/v2.0.10/0000-mingw64-malloc.patch | 30 | ||||
-rw-r--r-- | packages/mingw-w64/v2.0.10/0001-gendef-explicit-fallthrough.patch (renamed from packages/mingw-w64/v2.0.10/200-gendef-explicit-fallthrough.patch) | 12 | ||||
-rw-r--r-- | packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch | 27 |
3 files changed, 37 insertions, 32 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 0000000..c43b89e --- /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/v2.0.10/200-gendef-explicit-fallthrough.patch b/packages/mingw-w64/v2.0.10/0001-gendef-explicit-fallthrough.patch index 7cfd511..405a6ce 100644 --- a/packages/mingw-w64/v2.0.10/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 d9d5a61..0000000 --- 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> - |