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 E96EE138334 for ; Sun, 22 Jul 2018 10:16:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1862E0872; Sun, 22 Jul 2018 10:16:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 95142E0872 for ; Sun, 22 Jul 2018 10:16:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 57341335D4E for ; Sun, 22 Jul 2018 10:16:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2742237A for ; Sun, 22 Jul 2018 10:16:38 +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: <1532254589.0440c6f4dc3c200a4b8a6ce08b74dfdd7dc35d7b.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/, games-emulation/dolphin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-5.0.ebuild games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch X-VCS-Directories: games-emulation/dolphin/ games-emulation/dolphin/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 0440c6f4dc3c200a4b8a6ce08b74dfdd7dc35d7b X-VCS-Branch: master Date: Sun, 22 Jul 2018 10:16:38 +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: e02611cc-611b-454a-8d01-039e0ab47e01 X-Archives-Hash: 6ee0b77a74b4dee3a3de43609b0ff121 commit: 0440c6f4dc3c200a4b8a6ce08b74dfdd7dc35d7b Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jul 22 10:16:04 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jul 22 10:16:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0440c6f4 games-emulation/dolphin: xgetbv tweak for gcc-8 Package-Manager: Portage-2.3.43, Repoman-2.3.10 games-emulation/dolphin/dolphin-5.0.ebuild | 5 ++++- .../dolphin/files/dolphin-5.0-xgetbv.patch | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild index 6110f03b0a0..65b49e8a79d 100644 --- a/games-emulation/dolphin/dolphin-5.0.ebuild +++ b/games-emulation/dolphin/dolphin-5.0.ebuild @@ -70,7 +70,10 @@ DEPEND="${RDEPEND} sys-devel/gettext virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch ) +PATCHES=( + "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch + "${FILESDIR}"/${P}-xgetbv.patch +) src_prepare() { cmake-utils_src_prepare diff --git a/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch new file mode 100644 index 00000000000..ffa7cc81c13 --- /dev/null +++ b/games-emulation/dolphin/files/dolphin-5.0-xgetbv.patch @@ -0,0 +1,24 @@ +Workaround collision of _xgetbv intrinsic redeclaration: + +Source/Core/Common/x64CPUDetect.cpp:45:12: error: ambiguating new declaration of ‘u64 _xgetbv(u32)’ + static u64 _xgetbv(u32 index) + ^~~~~~~ +In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/x86intrin.h:74, + from Source/Core/Common/Intrinsics.h:12, + from Source/Core/Common/x64CPUDetect.cpp:10: +/usr/lib/gcc/x86_64-pc-linux-gnu/8.1.0/include/xsaveintrin.h:60:1: note: old declaration ‘long long int _xgetbv(unsigned int)’ + _xgetbv (unsigned int __A) + ^~~~~~~ + +Upstream fied it in + commit 823fdda30c38be953c3d425874f2adeabed2b5a8 + intrinsics: stop defining _xgetbv/_XCR_XFEATURE_ENABLED_MASK, which are reserved + +--- a/Source/Core/Common/x64CPUDetect.cpp ++++ b/Source/Core/Common/x64CPUDetect.cpp +@@ -45 +45 @@ static inline void __cpuid(int info[4], int function_id) +-static u64 _xgetbv(u32 index) ++static u64 _xgetbv_dolphin(u32 index) +@@ -137 +137 @@ void CPUInfo::Detect() +- if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6) ++ if ((_xgetbv_dolphin(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)