From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E506F1582EF for ; Wed, 19 Feb 2025 11:05:29 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id CDA3F34300E for ; Wed, 19 Feb 2025 11:05:29 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CFAEA110471; Wed, 19 Feb 2025 11:05:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id C4840110471 for ; Wed, 19 Feb 2025 11:05:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A66C342F9C for ; Wed, 19 Feb 2025 11:05:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADE2E26E6 for ; Wed, 19 Feb 2025 11:05:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1739963055.9d9ee0c5ae72128eb719f28048ab88cb85344965.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/unicorn/files/, dev-util/unicorn/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/unicorn/files/unicorn-2.1.2-return.patch dev-util/unicorn/unicorn-2.1.2.ebuild X-VCS-Directories: dev-util/unicorn/files/ dev-util/unicorn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9d9ee0c5ae72128eb719f28048ab88cb85344965 X-VCS-Branch: master Date: Wed, 19 Feb 2025 11:05:23 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44da258f-b922-47a0-bfda-8fd37f8c79dd X-Archives-Hash: 3c45af8852a6810819ca4520258360df commit: 9d9ee0c5ae72128eb719f28048ab88cb85344965 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Wed Feb 19 05:52:39 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 19 11:04:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9ee0c5 dev-util/unicorn: fix build failure on ppc Closes: https://bugs.gentoo.org/949905 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Sam James gentoo.org> dev-util/unicorn/files/unicorn-2.1.2-return.patch | 57 +++++++++++++++++++++++ dev-util/unicorn/unicorn-2.1.2.ebuild | 4 ++ 2 files changed, 61 insertions(+) diff --git a/dev-util/unicorn/files/unicorn-2.1.2-return.patch b/dev-util/unicorn/files/unicorn-2.1.2-return.patch new file mode 100644 index 000000000000..79e5f2f57197 --- /dev/null +++ b/dev-util/unicorn/files/unicorn-2.1.2-return.patch @@ -0,0 +1,57 @@ +From d03c0922e6c86741001ff8f40140be37c99eb83a Mon Sep 17 00:00:00 2001 +From: Disconnect3d +Date: Fri, 14 Feb 2025 18:04:30 +0100 +Subject: [PATCH] Fix #2103: qemu/target/ppc/mem_helper.c remove redundant + return statements (#2104) +Upstream: https://github.com/unicorn-engine/unicorn/pull/2104 + +--- a/qemu/target/ppc/mem_helper.c ++++ b/qemu/target/ppc/mem_helper.c +@@ -387,7 +387,6 @@ uint64_t helper_lq_le_parallel(CPUPPCState *env, target_ulong addr, + return int128_getlo(ret); + #else + g_assert_not_reached(); +- return 0; + #endif + } + +@@ -404,7 +403,6 @@ uint64_t helper_lq_be_parallel(CPUPPCState *env, target_ulong addr, + return int128_getlo(ret); + #else + g_assert_not_reached(); +- return 0; + #endif + } + +@@ -420,7 +418,6 @@ void helper_stq_le_parallel(CPUPPCState *env, target_ulong addr, + helper_atomic_sto_le_mmu(env, addr, val, opidx, GETPC()); + #else + g_assert_not_reached(); +- return 0; + #endif + } + +@@ -436,7 +433,6 @@ void helper_stq_be_parallel(CPUPPCState *env, target_ulong addr, + helper_atomic_sto_be_mmu(env, addr, val, opidx, GETPC()); + #else + g_assert_not_reached(); +- return 0; + #endif + } + #endif +@@ -465,7 +461,6 @@ uint32_t helper_stqcx_le_parallel(CPUPPCState *env, target_ulong addr, + return env->so + success * CRF_EQ_BIT; + #else + g_assert_not_reached(); +- return 0; + #endif + } + +@@ -492,7 +487,6 @@ uint32_t helper_stqcx_be_parallel(CPUPPCState *env, target_ulong addr, + return env->so + success * CRF_EQ_BIT; + #else + g_assert_not_reached(); +- return 0; + #endif + } + diff --git a/dev-util/unicorn/unicorn-2.1.2.ebuild b/dev-util/unicorn/unicorn-2.1.2.ebuild index 6afc0cd70a64..b65c4530a0af 100644 --- a/dev-util/unicorn/unicorn-2.1.2.ebuild +++ b/dev-util/unicorn/unicorn-2.1.2.ebuild @@ -39,6 +39,10 @@ RESTRICT="!test? ( test )" UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore" +PATCHES=( + "${FILESDIR}/${PN}-2.1.2-return.patch" +) + wrap_python() { if use python; then # src_prepare