commit: 9d9ee0c5ae72128eb719f28048ab88cb85344965 Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> AuthorDate: Wed Feb 19 05:52:39 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <mario.haustein <AT> hrz.tu-chemnitz.de> Signed-off-by: Sam James <sam <AT> 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 <[email protected]> +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
