From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 48FAE59CA3 for ; Sat, 12 Mar 2016 21:10:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67FAC21C001; Sat, 12 Mar 2016 21:10:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E93B621C001 for ; Sat, 12 Mar 2016 21:10:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A4AD340B23 for ; Sat, 12 Mar 2016 21:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D81E16C5 for ; Sat, 12 Mar 2016 21:10:46 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1457817000.f7ab9735aad27334ff3cca67aa177f24e0fb45df.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine/, app-emulation/wine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine/files/pr69140.c app-emulation/wine/wine-1.9.4.ebuild app-emulation/wine/wine-1.9.5.ebuild app-emulation/wine/wine-9999.ebuild X-VCS-Directories: app-emulation/wine/ app-emulation/wine/files/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: f7ab9735aad27334ff3cca67aa177f24e0fb45df X-VCS-Branch: master Date: Sat, 12 Mar 2016 21:10:46 +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: c6261180-c354-4d7e-ab8e-0a219ea54a82 X-Archives-Hash: 280c361938769e5dec4e998ebf562a66 commit: f7ab9735aad27334ff3cca67aa177f24e0fb45df Author: NP-Hardass gentoo org> AuthorDate: Sat Mar 12 21:09:22 2016 +0000 Commit: NP Hardass gentoo org> CommitDate: Sat Mar 12 21:10:00 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ab9735 app-emulation/wine: Check and warn about GCC-5.3 compile bug. #574044 Package-Manager: portage-2.2.26 app-emulation/wine/files/pr69140.c | 24 ++++++++++++++++++++++++ app-emulation/wine/wine-1.9.4.ebuild | 14 ++++++++++++++ app-emulation/wine/wine-1.9.5.ebuild | 14 ++++++++++++++ app-emulation/wine/wine-9999.ebuild | 14 ++++++++++++++ 4 files changed, 66 insertions(+) diff --git a/app-emulation/wine/files/pr69140.c b/app-emulation/wine/files/pr69140.c new file mode 100644 index 0000000..2c345dd --- /dev/null +++ b/app-emulation/wine/files/pr69140.c @@ -0,0 +1,24 @@ +/* { dg-do compile { target lp64 } } */ +/* { dg-options "-O2 -mincoming-stack-boundary=3" } */ + +typedef struct { + unsigned int buf[4]; + unsigned char in[64]; +} MD4_CTX; + +static void +MD4Transform (unsigned int buf[4], const unsigned int in[16]) +{ + unsigned int a, b, c, d; + (b) += ((((c)) & ((d))) | ((~(c)) & ((a)))) + (in[7]); + (a) += ((((b)) & ((c))) | ((~(b)) & ((d)))) + (in[8]); + (d) += ((((a)) & ((b))) | ((~(a)) & ((c)))) + (in[9]); + buf[3] += d; +} + +void __attribute__((ms_abi)) +MD4Update (MD4_CTX *ctx, const unsigned char *buf) +{ + MD4Transform( ctx->buf, (unsigned int *)ctx->in); + MD4Transform( ctx->buf, (unsigned int *)ctx->in); +} diff --git a/app-emulation/wine/wine-1.9.4.ebuild b/app-emulation/wine/wine-1.9.4.ebuild index 6388a5b..e47fe62 100644 --- a/app-emulation/wine/wine-1.9.4.ebuild +++ b/app-emulation/wine/wine-1.9.4.ebuild @@ -174,6 +174,20 @@ wine_build_environment_check() { return 1 fi fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + einfo "Checking for gcc-5-3 stack realignment compiler bug ..." + $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die + # Run in subshell to prevent "Aborted" message + if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then eerror "You need gcc-4.4+ to build 64-bit wine" diff --git a/app-emulation/wine/wine-1.9.5.ebuild b/app-emulation/wine/wine-1.9.5.ebuild index 2c75d7b..5abc380 100644 --- a/app-emulation/wine/wine-1.9.5.ebuild +++ b/app-emulation/wine/wine-1.9.5.ebuild @@ -174,6 +174,20 @@ wine_build_environment_check() { return 1 fi fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + einfo "Checking for gcc-5-3 stack realignment compiler bug ..." + $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die + # Run in subshell to prevent "Aborted" message + if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then eerror "You need gcc-4.4+ to build 64-bit wine" diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 2c75d7b..5abc380 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -174,6 +174,20 @@ wine_build_environment_check() { return 1 fi fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + einfo "Checking for gcc-5-3 stack realignment compiler bug ..." + $(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die + # Run in subshell to prevent "Aborted" message + if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then eerror "You need gcc-4.4+ to build 64-bit wine"