[PATCH v4 11/12] target/arm: Reorder meson.build rules

Philippe Mathieu-Daudé
2020-09-29T22:44:59Z

Reorder the rules to make this file easier to modify.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
I prefer to not squash that with the previous patch,
as it makes it harder to review.
---
target/arm/meson.build | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/target/arm/meson.build b/target/arm/meson.build
index 9b7727d4bb..341af8f2ca 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -14,6 +14,7 @@ gen = [

arm_ss = ss.source_set()
arm_ss.add(gen)
+arm_ss.add(zlib)
arm_ss.add(files(
'cpu.c',
'gdbstub.c',
@@ -21,6 +22,13 @@ arm_ss.add(files(
'vfp_helper.c',
))

+arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c'))
+
+arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
+ 'cpu64.c',
+ 'gdbstub64.c',
+))
+
arm_tcg_ss = ss.source_set()
arm_tcg_ss.add(files(
'arm-semi.c',
@@ -35,26 +43,16 @@ arm_tcg_ss.add(files(
'vec_helper.c',
))

-arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c'))
-
-arm_ss.add(zlib)
-
arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c'))
-
-arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c'))
-
-arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
- 'cpu64.c',
- 'gdbstub64.c',
-))
+arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c'))

arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files(
'helper-a64.c',
'mte_helper.c',
'pauth_helper.c',
- 'sve_helper.c',
'translate-a64.c',
'translate-sve.c',
+ 'sve_helper.c',
))

arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss)
--
2.26.2