summaryrefslogtreecommitdiff
path: root/dev-util/unicorn
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-01 07:10:13 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-10-01 07:10:13 +0100
commit42ff81a7480d9bba317b42fcca03b46da2a622ce (patch)
tree5a0ccbe2b71a4ec6c160b568160999a6afe316de /dev-util/unicorn
parent290844d409ace33d948956aec3c542ea6f4a7b13 (diff)
gentoo auto-resync : 01:10:2022 - 07:10:12
Diffstat (limited to 'dev-util/unicorn')
-rw-r--r--dev-util/unicorn/Manifest3
-rw-r--r--dev-util/unicorn/files/unicorn-2.0.0-lto.patch62
-rw-r--r--dev-util/unicorn/unicorn-2.0.0.ebuild4
3 files changed, 68 insertions, 1 deletions
diff --git a/dev-util/unicorn/Manifest b/dev-util/unicorn/Manifest
index 8ce6818a852e..4d6f61c3aa35 100644
--- a/dev-util/unicorn/Manifest
+++ b/dev-util/unicorn/Manifest
@@ -1,4 +1,5 @@
+AUX unicorn-2.0.0-lto.patch 2165 BLAKE2B 5858b3d7daf1f3654271d974f04836baa1c89a8204317c37b043e44f1c9005c2e4d1207308db253e2463f0c0b5ec2d59ef1717d941ad35feeab8c94b9518d3f5 SHA512 bd3f7e281f6c064b08dde128453da5db41ddd673fca53975a9e80a2ffe5f5fa05f5826f5027a7662ef11182e3f77680aa357341e0cbe085943047ed280af8d75
DIST unicorn-2.0.0.gh.tar.gz 4065595 BLAKE2B c16252a8a4af77c1c76c80101c30b92536d1677f93898acf4711e910dbbe1072715b83b4564c015592465eb51d00333e55849c3e06b07726ea3522286d8429bf SHA512 3996f19755ccdaac6e92a7455160e1c90a592ffb789d55ddc9d1bdcf1e68e8a6150bcfa1025a322780c04878be8de28e0ad5fdd79a7b25887ed2793b769f6789
-EBUILD unicorn-2.0.0.ebuild 1706 BLAKE2B c2d5d58fb9d2605c3d220252b04395bb8c2fcaaaa6c600c210e29eea7ab83a1aa3826195cbe8c26f40081f7e9ddbfdb8a441c4b6dbcdfd94604232547daa9849 SHA512 bdebe5e8676f92dfdf3c4fb66e1ae095f563f26fdca6932c724c665a87967cbd82f0d87a049ad47766cfb3f11176c8092abea54726fd15c34d5299871bb9f104
+EBUILD unicorn-2.0.0.ebuild 1749 BLAKE2B 964761d8c139fe79c8549715fefa2ed7a8f33928cec4eef2246143b3d690e4a2dcaec8a74cdf5c69b6da33aa1ded0958b56bf157ce355c943d090c3051860879 SHA512 5ac8715ced8967784293087a71203c12ec5dd7292ae4f2d764b90af3cf7591ba22b91935d39c873dafba670b8093cbc9b0d4485dd3dd716817f04f20c2cc56cb
EBUILD unicorn-9999.ebuild 1708 BLAKE2B 43214ad5df0aa79a0fd002304c0f4964d3b3f1ba90ca9a2f64b61e5c3e01ee9a47e323b364bc08d93dce036f196ce8c19888b5a93da95ad8ea335cb8ae3f6318 SHA512 bdd22202eb84437c619831116fad9438cac24b3eb85b3d0476ed5d43999572223c7e83ff7484212039a54d725df6b839cddbf59f2c09529f737b81dc72e2bd00
MISC metadata.xml 510 BLAKE2B 857f3ee3645ffdb28846b7305ec3066ddf49934225fe2c173a5a6b5b8354b208b6bb1337c2e11713b7c983a6fe3a1e67dae62bf64b0c9228f14ccfea8d57d5c5 SHA512 e1da17744042b95f11fb8b5f562020738c7495b0256469420cfa19fda995a24f02e806f67db8521e2f4a19a32825bf54a0865ec723d853cd5aa440c42b007946
diff --git a/dev-util/unicorn/files/unicorn-2.0.0-lto.patch b/dev-util/unicorn/files/unicorn-2.0.0-lto.patch
new file mode 100644
index 000000000000..f6bcda2a18f8
--- /dev/null
+++ b/dev-util/unicorn/files/unicorn-2.0.0-lto.patch
@@ -0,0 +1,62 @@
+commit 6d283cf464b82a86f7930e39c91c92ad3cefb58f
+Author: mio <ziqiaokong@outlook.com>
+Date: Sat Jul 23 20:39:01 2022 +0800
+
+ Fix ppc symbols clash
+
+Bug: https://bugs.gentoo.org/872998
+Bug: https://github.com/unicorn-engine/unicorn/issues/1662
+
+diff --git a/qemu/ppc.h b/qemu/ppc.h
+index 7022629e..eff4b69d 100644
+--- a/qemu/ppc.h
++++ b/qemu/ppc.h
+@@ -1708,4 +1708,12 @@
+ #define ppc_dcr_init ppc_dcr_init_ppc
+ #define ppc_cpu_pir ppc_cpu_pir_ppc
+ #define ppc_irq_reset ppc_irq_reset_ppc
++#define store_booke_tsr store_booke_tsr_ppc
++#define get_pteg_offset32 get_pteg_offset32_ppc
++#define ppc_booke_timers_init ppc_booke_timers_init_ppc
++#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc
++#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc
++#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc
++#define store_booke_tcr store_booke_tcr_ppc
++#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc
+ #endif
+diff --git a/qemu/ppc64.h b/qemu/ppc64.h
+index 992caf87..c08ee2d6 100644
+--- a/qemu/ppc64.h
++++ b/qemu/ppc64.h
+@@ -1708,4 +1708,12 @@
+ #define ppc_dcr_init ppc_dcr_init_ppc64
+ #define ppc_cpu_pir ppc_cpu_pir_ppc64
+ #define ppc_irq_reset ppc_irq_reset_ppc64
++#define store_booke_tsr store_booke_tsr_ppc64
++#define get_pteg_offset32 get_pteg_offset32_ppc64
++#define ppc_booke_timers_init ppc_booke_timers_init_ppc64
++#define ppc_hash32_handle_mmu_fault ppc_hash32_handle_mmu_fault_ppc64
++#define gen_helper_store_booke_tsr gen_helper_store_booke_tsr_ppc64
++#define gen_helper_store_booke_tcr gen_helper_store_booke_tcr_ppc64
++#define store_booke_tcr store_booke_tcr_ppc64
++#define ppc_hash32_get_phys_page_debug ppc_hash32_get_phys_page_debug_ppc64
+ #endif
+diff --git a/symbols.sh b/symbols.sh
+index 2968b959..0d426c00 100755
+--- a/symbols.sh
++++ b/symbols.sh
+@@ -6264,6 +6264,14 @@ ppc_dcr_register \
+ ppc_dcr_init \
+ ppc_cpu_pir \
+ ppc_irq_reset \
++store_booke_tsr \
++get_pteg_offset32 \
++ppc_booke_timers_init \
++ppc_hash32_handle_mmu_fault \
++gen_helper_store_booke_tsr \
++gen_helper_store_booke_tcr \
++store_booke_tcr \
++ppc_hash32_get_phys_page_debug \
+ "
+
+ ppc64_SYMBOLS=${ppc_SYMBOLS}
diff --git a/dev-util/unicorn/unicorn-2.0.0.ebuild b/dev-util/unicorn/unicorn-2.0.0.ebuild
index b50065f271bc..76a25d55547e 100644
--- a/dev-util/unicorn/unicorn-2.0.0.ebuild
+++ b/dev-util/unicorn/unicorn-2.0.0.ebuild
@@ -34,6 +34,10 @@ RDEPEND="python? ( ${PYTHON_DEPS} )"
BDEPEND="virtual/pkgconfig
python? ( ${DISTUTILS_DEPS} )"
+PATCHES=(
+ "${FILESDIR}/${P}-lto.patch"
+)
+
UNICORN_TARGETS="x86 arm aarch64 riscv mips sparc m68k ppc s390x tricore"
wrap_python() {