Commit 46be91ee4f for qemu.org
commit 46be91ee4f8c7ed7ac5c78e4e0bafa39132ac8b1
Author: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Thu Apr 23 11:12:54 2026 +0200
target/microblaze: Compile translate.c as common unit
In order do build translate.c as a common unit we need to
replace:
"accel/tcg/cpu-ldst.h" -> "accel/tcg/cpu-ldst-common.h"
and:
#include "tcg/tcg-op.h" -> #include "tcg/tcg-op-common.h"
-> #include "tcg/tcg-op-mem.h"
taking care to define TCG_ADDRESS_BITS, which is fixed
for these 32-bit targets.
Remove the now empty microblaze_ss[] source set.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Message-Id: <20260423100612.27278-10-philmd@linaro.org>
diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build
index 2ce50f3539..9c1ecd1cf1 100644
--- a/target/microblaze/meson.build
+++ b/target/microblaze/meson.build
@@ -1,16 +1,12 @@
gen = decodetree.process('insns.decode')
microblaze_common_ss = ss.source_set()
+microblaze_common_ss.add(gen)
microblaze_common_ss.add(files(
'cpu.c',
'gdbstub.c',
'helper.c',
'op_helper.c',
-))
-
-microblaze_ss = ss.source_set()
-microblaze_ss.add(gen)
-microblaze_ss.add(files(
'translate.c',
))
@@ -26,7 +22,6 @@ microblaze_system_ss.add(files(
'machine.c',
))
-target_arch += {'microblaze': microblaze_ss}
target_user_arch += {'microblaze': microblaze_user_ss}
target_system_arch += {'microblaze': microblaze_system_ss}
target_common_system_arch += {'microblaze': microblaze_common_system_ss}
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index bf8f864c32..74b5420ed2 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -20,9 +20,11 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "accel/tcg/cpu-ldst.h"
+#include "accel/tcg/cpu-ldst-common.h"
#include "accel/tcg/cpu-mmu-index.h"
-#include "tcg/tcg-op.h"
+#define TCG_ADDRESS_BITS 32
+#include "tcg/tcg-op-common.h"
+#include "tcg/tcg-op-mem.h"
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
#include "exec/translator.h"