From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F0B81396D0 for ; Sat, 12 Aug 2017 17:52:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9DE21FC056; Sat, 12 Aug 2017 17:52:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D8331FC056 for ; Sat, 12 Aug 2017 17:52:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34F7F34170D for ; Sat, 12 Aug 2017 17:52:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9950276D1 for ; Sat, 12 Aug 2017 17:52:45 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1502559783.9ab22c6131945c53dedb9ff31d0cae13a5583ecb.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-runtime/, dev-util/mingw64-runtime/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild X-VCS-Directories: dev-util/mingw64-runtime/files/ dev-util/mingw64-runtime/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 9ab22c6131945c53dedb9ff31d0cae13a5583ecb X-VCS-Branch: master Date: Sat, 12 Aug 2017 17:52:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bb644356-2f24-4a08-bc9a-3c7ad16eecf7 X-Archives-Hash: f9f6fb80e82a125a4e76eee0aeee136a commit: 9ab22c6131945c53dedb9ff31d0cae13a5583ecb Author: Marty Plummer gmail com> AuthorDate: Wed Jun 7 00:25:32 2017 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Aug 12 17:43:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab22c61 dev-util/mingw64-runtime: fix build with USE="tools" with gcc7 Included patch only changes code formatting and comments. See: https://sourceforge.net/p/mingw-w64/bugs/616/ Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4878 ...ingw64-runtime-5.0.2-implicit-fallthrough.patch | 41 ++++++++++++++++++++++ .../mingw64-runtime-5.0.2-r1.ebuild | 1 + 2 files changed, 42 insertions(+) diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch new file mode 100644 index 00000000000..859e00243d3 --- /dev/null +++ b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch @@ -0,0 +1,41 @@ +diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c +index a935abfe..cefdd8cb 100644 +--- a/mingw-w64-tools/gendef/src/gendef.c ++++ b/mingw-w64-tools/gendef/src/gendef.c +@@ -1031,13 +1031,16 @@ 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_lb: +- case c_2: sz++; +- case c_retn: case c_retf: +- case c_iret: case c_int3: +- case c_ad: case c_op: ++ case c_4: sz++; // fallthrough ++ case c_3: sz++; // fallthrough ++ case c_lb: // fallthrough ++ case c_2: sz++; // fallthrough ++ case c_retn: // fallthrough ++ case c_retf: // fallthrough ++ case c_iret: // fallthrough ++ case c_int3: // fallthrough ++ case c_ad: // fallthrough ++ case c_op: // fallthrough + case c_1: *aCode=tb1; return sz; + case c_lv: + if (oper_mode) sz+=4; +diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c +index b2430bbc..6a37b1a0 100644 +--- a/mingw-w64-tools/genpeimg/src/genpeimg.c ++++ b/mingw-w64-tools/genpeimg/src/genpeimg.c +@@ -203,7 +203,7 @@ pass_args (int argc, char **argv) + goto error_point; + case 'h': + if (h[2] == 0) +- show_usage (); ++ show_usage (); // fallthrough + default: + error_point: + fprintf (stderr, "Unknown option ,%s'\n", h); diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild index e37ad32d072..534091fe654 100644 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild +++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild @@ -30,6 +30,7 @@ S="${WORKDIR}/mingw-w64-v${PV}" PATCHES=( "${FILESDIR}/${PN}-4.0.1-winpthreads.patch" "${FILESDIR}/${PN}-4.0.1-build.patch" + "${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch" ) is_crosscompile() {