portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply patches/fix_zydis_amalgamated_riscv32_build to subproject

Browse source 
We already vendor a patched zydis and this fix should be available to
everyone, not only CI.
This commit is contained in:
Florian Märkl 2026-05-10 18:30:17 +02:00 committed by NOT XVilka
parent 22edb366ef
commit 1cb5859f8e
3 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/riscv32-qemu-setup-all.sh vendored
View file

@ -17,8 +17,6 @@ export PATH="${BOOTLIN_TOOLS}:${PATH}"
# Build Rizin # Build Rizin
meson setup build --cross-file doc/examples/cross_builds/meson-linux-riscv32.ini meson setup build --cross-file doc/examples/cross_builds/meson-linux-riscv32.ini
meson compile -C build || true # Expected to fail due to Zydis bug on RISC-V 32-bit meson compile -C build || true # Expected to fail due to Zydis bug on RISC-V 32-bit
# Quick and dirty fix for Zydis compilation error, remove when upstream merges a fix and we bump
patch -p1 < patches/fix_zydis_amalgamated_riscv32_build
# Build again # Build again
meson compile -C build meson compile -C build

22
patches/fix_zydis_amalgamated_riscv32_build
View file

@ -1,22 +0,0 @@
diff --git a/home/mostafa/BEFORE_ZYDIS.c b/subprojects/zydis/amalgamated-dist/Zydis.c
index 66dcb1ed3d..297dfd050a 100644
--- a/subprojects/zydis/amalgamated-dist/Zydis.c
+++ b/subprojects/zydis/amalgamated-dist/Zydis.c
@@ -54437,7 +54437,7 @@ static const char* const DECIMAL_LOOKUP =
/* Decimal */
/* ---------------------------------------------------------------------------------------------- */
-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) || defined(ZYAN_S390)
+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) || defined(ZYAN_S390) || defined(ZYAN_RISCV32)
static ZyanStatus ZydisStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length)
{
ZYAN_ASSERT(string);
@@ -54529,7 +54529,7 @@ static ZyanStatus ZydisStringAppendDecU64(ZyanString* string, ZyanU64 value, Zya
/* Hexadecimal */
/* ---------------------------------------------------------------------------------------------- */
-#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC)
+#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) || defined(ZYAN_RISCV32)
static ZyanStatus ZydisStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length,
ZyanBool force_leading_number, ZyanBool uppercase)
{

4
subprojects/packagefiles/zydis/amalgamated-dist/Zydis.c
View file

@ -54437,7 +54437,7 @@ static const char* const DECIMAL_LOOKUP =
/* Decimal */ /* Decimal */
/* ---------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------- */
#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) || defined(ZYAN_S390) #if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) || defined(ZYAN_S390) || defined(ZYAN_RISCV32)
static ZyanStatus ZydisStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length) static ZyanStatus ZydisStringAppendDecU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length)
{ {
ZYAN_ASSERT(string); ZYAN_ASSERT(string);
@ -54529,7 +54529,7 @@ static ZyanStatus ZydisStringAppendDecU64(ZyanString* string, ZyanU64 value, Zya
/* Hexadecimal */ /* Hexadecimal */
/* ---------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------- */
#if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) #if defined(ZYAN_X86) || defined(ZYAN_ARM) || defined(ZYAN_EMSCRIPTEN) || defined(ZYAN_WASM) || defined(ZYAN_PPC) || defined(ZYAN_RISCV32)
static ZyanStatus ZydisStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length, static ZyanStatus ZydisStringAppendHexU32(ZyanString* string, ZyanU32 value, ZyanU8 padding_length,
ZyanBool force_leading_number, ZyanBool uppercase) ZyanBool force_leading_number, ZyanBool uppercase)
{ {