Add arm_ss to arm_common_user_system_ss and arm_system_ss to
arm_common_system_ss. Drop target_arch and target_system_arch
so ARM CPU objects are not built per target.

Signed-off-by: Yonggang Luo <[email protected]>
---
 target/arm/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/arm/meson.build b/target/arm/meson.build
index 0369f96b4cc..11815a0908d 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -68,11 +68,11 @@ if 'CONFIG_TCG' in config_all_accel
    subdir('tcg')
 endif
 
+arm_common_user_system_ss.add_all(arm_ss)
 arm_user_ss.add_all(arm_common_user_system_ss)
 arm_common_system_ss.add_all(arm_common_user_system_ss)
+arm_common_system_ss.add_all(arm_system_ss)
 
-target_arch += {'arm': arm_ss}
-target_system_arch += {'arm': arm_system_ss}
 target_user_arch += {'arm': arm_user_ss}
 target_common_arch += {'arm': arm_common_ss}
 target_common_system_arch += {'arm': arm_common_system_ss}
-- 
2.52.0.windows.1


Reply via email to