From c1a2717334b9612f86b236b7da7b00550418b76c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 14 Jun 2018 15:10:29 +0200 Subject: [PATCH] Update to 5.0.3 --- .gitignore | 1 + ...args-add-a-fallthru-comment-in-the-s.patch | 35 ------------- ...nic-add-fallthru-comments-in-the-swi.patch | 49 ------------------- mingw-w64-tools.spec | 13 ++--- sources | 2 +- 5 files changed, 7 insertions(+), 93 deletions(-) delete mode 100644 0001-genpeimg.c-pass_args-add-a-fallthru-comment-in-the-s.patch delete mode 100644 0002-gendef.c-getMemonic-add-fallthru-comments-in-the-swi.patch diff --git a/.gitignore b/.gitignore index 6a014e3..b4b8b68 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /mingw-w64-mingw-w64-502c72047e68fecf07f628628b75296863ff5b35.zip /mingw-w64-mingw-w64-430863ffea2f6101fbfc0ee35ee098ab2f96b53c.zip /mingw-w64-v5.0.2.tar.bz2 +/mingw-w64-v5.0.3.tar.bz2 diff --git a/0001-genpeimg.c-pass_args-add-a-fallthru-comment-in-the-s.patch b/0001-genpeimg.c-pass_args-add-a-fallthru-comment-in-the-s.patch deleted file mode 100644 index df266b1..0000000 --- a/0001-genpeimg.c-pass_args-add-a-fallthru-comment-in-the-s.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8243669e8dba9220d7a30b5eb3617b2ecedae4d8 Mon Sep 17 00:00:00 2001 -From: sezero -Date: Thu, 15 Jun 2017 09:45:52 +0300 -Subject: [PATCH 1/2] 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(-) - -diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c -index f8ac44e1..19bc5e2c 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); --- -2.13.0 - diff --git a/0002-gendef.c-getMemonic-add-fallthru-comments-in-the-swi.patch b/0002-gendef.c-getMemonic-add-fallthru-comments-in-the-swi.patch deleted file mode 100644 index 13258da..0000000 --- a/0002-gendef.c-getMemonic-add-fallthru-comments-in-the-swi.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b5d311c8e573a17a7b9b38d303fa7db6dc45e98f Mon Sep 17 00:00:00 2001 -From: sezero -Date: Thu, 15 Jun 2017 09:50:00 +0300 -Subject: [PATCH 2/2] 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(-) - -diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c -index 9d3c7954..12fd1e73 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; --- -2.13.0 - diff --git a/mingw-w64-tools.spec b/mingw-w64-tools.spec index d64ce5d..e7008e8 100644 --- a/mingw-w64-tools.spec +++ b/mingw-w64-tools.spec @@ -4,8 +4,8 @@ #%%global branch trunk Name: mingw-w64-tools -Version: 5.0.2 -Release: 4%{?dist} +Version: 5.0.3 +Release: 1%{?dist} Summary: Supplementary tools which are part of the mingw-w64 toolchain # http://sourceforge.net/mailarchive/forum.php?thread_name=5157C0FC.1010309%40users.sourceforge.net&forum_name=mingw-w64-public @@ -29,10 +29,6 @@ Patch0: mingw-w64-tools-2.0.999-s390.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1047727 Patch1: mingw-w64-tools-widl-includedir.patch -# Backported from upstream -Patch2: 0001-genpeimg.c-pass_args-add-a-fallthru-comment-in-the-s.patch -Patch3: 0002-gendef.c-getMemonic-add-fallthru-comments-in-the-swi.patch - BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw64-filesystem >= 95 @@ -54,8 +50,6 @@ unzip %{S:0} %endif %patch0 -p2 -b .s390 %patch1 -p1 -b .widl-includedir -%patch2 -p1 -%patch3 -p1 %build @@ -107,6 +101,9 @@ popd %changelog +* Thu Jun 14 2018 Sandro Mani - 5.0.3-1 +- Update to 5.0.3 + * Thu Feb 08 2018 Fedora Release Engineering - 5.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 02431c2..82a674c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mingw-w64-v5.0.2.tar.bz2) = 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060 +SHA512 (mingw-w64-v5.0.3.tar.bz2) = 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9