target/arm: Introduce common system/user meson source set
Introduce a source set common to system / user. No logical change intended. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> Acked-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20260526203722.79463-7-philmd@linaro.org>
Philippe Mathieu-Daudé committed
May 15, 2026 at 14:42 UTC
f6e5879973b93b0c13c1de7cc8e2e2242f4ce12f
2 files changed
+22
-39
target/arm/meson.build
+11
-10
@@ -1,6 +1,7 @@
1
arm_ss = ss.source_set()
2
arm_common_ss = ss.source_set()
3
arm_common_system_ss = ss.source_set()
4
+arm_common_user_system_ss = ss.source_set()
5
arm_system_ss = ss.source_set()
6
arm_stubs_ss = ss.source_set()
7
arm_user_ss = ss.source_set()
@@ -16,6 +17,13 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
17
arm_common_ss.add(files(
18
'mmuidx.c',
19
))
20
+arm_common_user_system_ss.add(files(
21
+ 'cpregs-gcs.c',
22
+ 'cpregs-pmu.c',
23
+ 'debug_helper.c',
24
+ 'helper.c',
25
+ 'vfp_fpscr.c',
26
+))
27
28
arm_common_system_ss.add(files(
29
'arm-qmp-cmds.c',
@@ -26,11 +34,6 @@ arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c'))
34
arm_user_ss.add(files('cpu.c'))
35
arm_stubs_ss.add(files('cpu32-stubs.c'))
36
arm_user_ss.add(files(
29
- 'cpregs-gcs.c',
30
- 'cpregs-pmu.c',
31
- 'debug_helper.c',
32
- 'helper.c',
33
- 'vfp_fpscr.c',
37
'el2-stubs.c',
38
'cpregs-omap-stub.c',
39
))
@@ -45,15 +48,10 @@ arm_common_system_ss.add(files(
48
'arch_dump.c',
49
'arm-powerctl.c',
50
'cortex-regs.c',
48
- 'cpregs-gcs.c',
51
'cpregs-omap.c',
50
- 'cpregs-pmu.c',
52
'cpu-irq.c',
52
- 'debug_helper.c',
53
- 'helper.c',
53
'machine.c',
54
'ptw.c',
56
- 'vfp_fpscr.c',
55
))
56
57
subdir('hvf')
@@ -65,6 +63,9 @@ else
63
arm_common_system_ss.add(files('tcg-stubs.c'))
64
endif
65
66
+arm_user_ss.add_all(arm_common_user_system_ss)
67
+arm_common_system_ss.add_all(arm_common_user_system_ss)
68
+
69
target_arch += {'arm': arm_ss}
70
target_system_arch += {'arm': arm_system_ss}
71
target_user_arch += {'arm': arm_user_ss}
target/arm/tcg/meson.build
+11
-29
@@ -52,32 +52,26 @@ arm_common_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('cpu-v7m.c'))
52
arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c'))
53
54
arm_common_ss.add(zlib)
55
-
55
arm_common_ss.add(files(
56
'arith_helper.c',
57
'crypto_helper.c',
58
'idau.c',
59
))
60
62
-arm_common_system_ss.add(
61
+arm_common_user_system_ss.add(
62
m_nocp_d,
63
mve_d,
64
neon_d,
65
translate32_d,
66
vfp_d,
67
files(
69
- 'cpregs-at.c',
68
'debug.c',
71
- 'gicv5-cpuif.c',
72
- 'hflags.c',
69
'gengvec.c',
70
+ 'hflags.c',
71
'm_helper.c',
72
'mve_helper.c',
73
'neon_helper.c',
74
'op_helper.c',
78
- 'psci.c',
79
- 'tlb_helper.c',
80
- 'tlb-insns.c',
75
'translate.c',
76
'translate-m-nocp.c',
77
'translate-mve.c',
@@ -86,26 +80,14 @@ arm_common_system_ss.add(
80
'vec_helper.c',
81
'vfp_helper.c',
82
))
89
-arm_user_ss.add(
90
- m_nocp_d,
91
- mve_d,
92
- neon_d,
93
- translate32_d,
94
- vfp_d,
95
- files(
96
- 'debug.c',
97
- 'gengvec.c',
98
- 'hflags.c',
99
- 'm_helper.c',
100
- 'mve_helper.c',
101
- 'neon_helper.c',
102
- 'op_helper.c',
83
+
84
+arm_common_system_ss.add(files(
85
+ 'cpregs-at.c',
86
+ 'gicv5-cpuif.c',
87
+ 'psci.c',
88
+ 'tlb_helper.c',
89
+ 'tlb-insns.c',
90
+))
91
+arm_user_ss.add(files(
92
'tlb_helper.c',
104
- 'translate.c',
105
- 'translate-m-nocp.c',
106
- 'translate-mve.c',
107
- 'translate-neon.c',
108
- 'translate-vfp.c',
109
- 'vec_helper.c',
110
- 'vfp_helper.c',
93
))