target/s390x: Introduce common system/user meson source set
Introduce a source set common to system / user. Start it with the files built in both sets: 'cpu_models_user.c' and 'gdbstub.c' No logical change intended. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com> Message-Id: <20260423135035.50126-4-philmd@linaro.org>
Philippe Mathieu-Daudé committed
Apr 23, 2026 at 12:38 UTC
0b83acf2f056cc7f5a9b05b1af9c97c91e2a7b1e
1 file changed
+13
-12
target/s390x/meson.build
+13
-12
@@ -1,4 +1,9 @@
1
s390x_ss = ss.source_set()
2
+s390x_common_ss = ss.source_set()
3
+s390x_common_system_ss = ss.source_set()
4
+s390x_system_ss = ss.source_set()
5
+s390x_user_ss = ss.source_set()
6
+
7
s390x_ss.add(files(
8
'cpu.c',
9
'cpu_features.c',
@@ -15,15 +20,16 @@ gen_features_h = custom_target('gen-features.h',
20
capture: true,
21
command: gen_features)
22
18
-s390x_ss.add(gen_features_h)
23
+s390x_common_ss.add(gen_features_h)
24
+s390x_common_ss.add(files(
25
+ 'cpu_models_user.c',
26
+ 'gdbstub.c',
27
+))
28
20
-s390x_system_ss = ss.source_set()
29
s390x_system_ss.add(files(
30
'ioinst.c',
31
))
32
25
-s390x_common_system_ss = ss.source_set()
26
-s390x_common_system_ss.add(gen_features_h)
33
s390x_common_system_ss.add(files(
34
'helper.c',
35
'arch_dump.c',
@@ -32,19 +38,14 @@ s390x_common_system_ss.add(files(
38
'mmu_helper.c',
39
'sigp.c',
40
'cpu-system.c',
35
- 'cpu_models_system.c',
36
- 'gdbstub.c',
37
-))
38
-
39
-s390x_user_ss = ss.source_set()
40
-s390x_user_ss.add(files(
41
- 'cpu_models_user.c',
42
- 'gdbstub.c',
41
))
42
43
subdir('tcg')
44
subdir('kvm')
45
46
+s390x_common_system_ss.add_all(s390x_common_ss)
47
+s390x_user_ss.add_all(s390x_common_ss)
48
+
49
target_arch += {'s390x': s390x_ss}
50
target_system_arch += {'s390x': s390x_system_ss}
51
target_common_system_arch += {'s390x': s390x_common_system_ss}