Generated decode files must be duplicated between user and system, as
they are generated in private folders per libs, and can't be included
otherwise, as meson does not give control on output folder.
Indeed, meson generator is a different approach than custom_target, and
this is a limitation by design.
They were already duplicated between arch variants anyway, so nothing
new here.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
target/arm/tcg/meson.build | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build
index 3e96c77df73..46bf4a6d76b 100644
--- a/target/arm/tcg/meson.build
+++ b/target/arm/tcg/meson.build
@@ -30,7 +30,6 @@ arm_ss.add(files(
'translate-m-nocp.c',
'translate-mve.c',
'translate-neon.c',
- 'translate-vfp.c',
'm_helper.c',
'mve_helper.c',
'op_helper.c',
@@ -60,7 +59,10 @@ arm_common_ss.add(files(
'crypto_helper.c',
))
-arm_common_system_ss.add(files(
+arm_common_system_ss.add(
+ decodetree.process('vfp.decode', extra_args: '--decode=disas_vfp'),
+ decodetree.process('vfp-uncond.decode', extra_args: '--decode=disas_vfp_uncond'),
+ files(
'cpregs-at.c',
'debug.c',
'hflags.c',
@@ -68,6 +70,7 @@ arm_common_system_ss.add(files(
'psci.c',
'tlb_helper.c',
'tlb-insns.c',
+ 'translate-vfp.c',
'vec_helper.c',
'vfp_helper.c',
))
@@ -76,6 +79,7 @@ arm_user_ss.add(files(
'hflags.c',
'neon_helper.c',
'tlb_helper.c',
+ 'translate-vfp.c',
'vec_helper.c',
'vfp_helper.c',
))
--
2.47.3