meson: Rename target_softmmu_arch -> target_system_arch

Finish the convertion started with commit de6cd7599b
("meson: Replace softmmu_ss -> system_ss"). If the
$target_type is 'system', then use the target_system_arch[]
source set :)

Mechanical change doing:

  $ sed -i -e s/target_softmmu_arch/target_system_arch/g \
      $(git grep -l target_softmmu_arch)

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20231004090629.37473-13-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index 0f990bb3e9034e392b97daea2fab8d05f70ab8ae..21f78da7d1dc9f6af811db16500e2790a7684556 100644 (file)
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -225,14 +225,14 @@ Target-dependent emulator sourcesets:
   The sourceset is only used for system emulators.
 
   Each subdirectory in ``target/`` instead should add one sourceset to each
-  of the ``target_arch`` and ``target_softmmu_arch``, which are used respectively
+  of the ``target_arch`` and ``target_system_arch``, which are used respectively
   for all emulators and for system emulators only.  For example::
 
     arm_ss = ss.source_set()
     arm_system_ss = ss.source_set()
     ...
     target_arch += {'arm': arm_ss}
-    target_softmmu_arch += {'arm': arm_system_ss}
+    target_system_arch += {'arm': arm_system_ss}
 
 Module sourcesets:
   There are two dictionaries for modules: ``modules`` is used for

diff --git a/meson.build b/meson.build
index 54907c7fa9ce9c4b6a37f90692376e131e5a6409..167cb70956a3f606ad8fe84177e2bf426958b868 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3198,7 +3198,7 @@ modules = {}
 target_modules = {}
 hw_arch = {}
 target_arch = {}
-target_softmmu_arch = {}
+target_system_arch = {}
 target_user_arch = {}
 
 ###############
@@ -3718,7 +3718,7 @@ foreach target : target_dirs
   endif
   if target.endswith('-softmmu')
     target_type='system'
-    t = target_softmmu_arch[target_base_arch].apply(config_target, strict: false)
+    t = target_system_arch[target_base_arch].apply(config_target, strict: false)
     arch_srcs += t.sources()
     arch_deps += t.dependencies()
 

diff --git a/target/alpha/meson.build b/target/alpha/meson.build
index 3f5253c002779d4ad7f547b911dc05742272425e..d3502dd823fccd859a0aa976d62c866c5663de4c 100644 (file)
--- a/target/alpha/meson.build
+++ b/target/alpha/meson.build
@@ -15,4 +15,4 @@ alpha_system_ss = ss.source_set()
 alpha_system_ss.add(files('machine.c'))
 
 target_arch += {'alpha': alpha_ss}
-target_softmmu_arch += {'alpha': alpha_system_ss}
+target_system_arch += {'alpha': alpha_system_ss}

diff --git a/target/arm/meson.build b/target/arm/meson.build
index e645e456da4e2efbf6551b4c656f42b028f161fc..5d04a8e94f2ebace7dd56ee3c92923b4e1b8d55d 100644 (file)
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -35,4 +35,4 @@ else
 endif
 
 target_arch += {'arm': arm_ss}
-target_softmmu_arch += {'arm': arm_system_ss}
+target_system_arch += {'arm': arm_system_ss}

diff --git a/target/avr/meson.build b/target/avr/meson.build
index a24cf6d26de09551d35a726e14b2916e993f8647..3e172bde1ce57dc8e66f8a6b170305c1ea946aea 100644 (file)
--- a/target/avr/meson.build
+++ b/target/avr/meson.build
@@ -17,4 +17,4 @@ avr_ss.add(files(
 avr_system_ss.add(files('machine.c'))
 
 target_arch += {'avr': avr_ss}
-target_softmmu_arch += {'avr': avr_system_ss}
+target_system_arch += {'avr': avr_system_ss}

diff --git a/target/cris/meson.build b/target/cris/meson.build
index 07dc3a5682f458cdd592220b5679c4f4163f25b5..bbfcdf7f7a35b9e7ce10165ea85e25a6d729bd9f 100644 (file)
--- a/target/cris/meson.build
+++ b/target/cris/meson.build
@@ -14,4 +14,4 @@ cris_system_ss.add(files(
 ))
 
 target_arch += {'cris': cris_ss}
-target_softmmu_arch += {'cris': cris_system_ss}
+target_system_arch += {'cris': cris_system_ss}

diff --git a/target/hppa/meson.build b/target/hppa/meson.build
index 59b68e82e2b9d30bed89ffddce26fa5a2b44790c..f47e54f5fa971e1dd3981ab6ad5ef660efb25b04 100644 (file)
--- a/target/hppa/meson.build
+++ b/target/hppa/meson.build
@@ -20,4 +20,4 @@ hppa_system_ss.add(files(
 ))
 
 target_arch += {'hppa': hppa_ss}
-target_softmmu_arch += {'hppa': hppa_system_ss}
+target_system_arch += {'hppa': hppa_system_ss}

diff --git a/target/i386/meson.build b/target/i386/meson.build
index 6f1036d46997f53b9f43dbfacca61f67d57a53f1..7c74bfa8591b279e506f64451de406f9d718691d 100644 (file)
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -31,5 +31,5 @@ subdir('hvf')
 subdir('tcg')
 
 target_arch += {'i386': i386_ss}
-target_softmmu_arch += {'i386': i386_system_ss}
+target_system_arch += {'i386': i386_system_ss}
 target_user_arch += {'i386': i386_user_ss}

diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build
index 7fbf045a5d218e6ecbd6057d0077332c3ce6275a..18e8191e2b67ea369ea43796c471e3d7a89a9d01 100644 (file)
--- a/target/loongarch/meson.build
+++ b/target/loongarch/meson.build
@@ -30,4 +30,4 @@ common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), gen])
 loongarch_ss.add_all(when: 'CONFIG_TCG', if_true: [loongarch_tcg_ss])
 
 target_arch += {'loongarch': loongarch_ss}
-target_softmmu_arch += {'loongarch': loongarch_system_ss}
+target_system_arch += {'loongarch': loongarch_system_ss}

diff --git a/target/m68k/meson.build b/target/m68k/meson.build
index 355db26c6f5534fc30193140fb70ef5047de59e7..8d3f9ce2880a69a770cccec5ce5ba733dd066e65 100644 (file)
--- a/target/m68k/meson.build
+++ b/target/m68k/meson.build
@@ -16,4 +16,4 @@ m68k_system_ss.add(files(
 ))
 
 target_arch += {'m68k': m68k_ss}
-target_softmmu_arch += {'m68k': m68k_system_ss}
+target_system_arch += {'m68k': m68k_system_ss}

diff --git a/target/microblaze/meson.build b/target/microblaze/meson.build
index 50fd9ff378dd72b4f36e97277b9edcfc050b731f..3ed4fbb67a748665b7893b92788f2f2c9e60ffe6 100644 (file)
--- a/target/microblaze/meson.build
+++ b/target/microblaze/meson.build
@@ -17,4 +17,4 @@ microblaze_system_ss.add(files(
 ))
 
 target_arch += {'microblaze': microblaze_ss}
-target_softmmu_arch += {'microblaze': microblaze_system_ss}
+target_system_arch += {'microblaze': microblaze_system_ss}

diff --git a/target/mips/meson.build b/target/mips/meson.build
index f35e8f0ecad97dca7f43f0bbbbf5261793e5c584..e57ef24ecf4f556fe196bd7193c892e5d0399367 100644 (file)
--- a/target/mips/meson.build
+++ b/target/mips/meson.build
@@ -19,5 +19,5 @@ endif
 mips_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'))
 
 target_arch += {'mips': mips_ss}
-target_softmmu_arch += {'mips': mips_system_ss}
+target_system_arch += {'mips': mips_system_ss}
 target_user_arch += {'mips': mips_user_ss}

diff --git a/target/nios2/meson.build b/target/nios2/meson.build
index 8f0f9dc62899ef3e0698f701a4e8987cc5fdd0ea..12d8abf0bd2f91209841d2574fb7eda9a81378ff 100644 (file)
--- a/target/nios2/meson.build
+++ b/target/nios2/meson.build
@@ -14,4 +14,4 @@ nios2_system_ss.add(files(
 ))
 
 target_arch += {'nios2': nios2_ss}
-target_softmmu_arch += {'nios2': nios2_system_ss}
+target_system_arch += {'nios2': nios2_system_ss}

diff --git a/target/openrisc/meson.build b/target/openrisc/meson.build
index c1cd943f78f16de74f1bb52acc8f1f149c68d340..31608b6dc7feb99c99832b0e04b6593360d02a4e 100644 (file)
--- a/target/openrisc/meson.build
+++ b/target/openrisc/meson.build
@@ -22,4 +22,4 @@ openrisc_system_ss.add(files(
 ))
 
 target_arch += {'openrisc': openrisc_ss}
-target_softmmu_arch += {'openrisc': openrisc_system_ss}
+target_system_arch += {'openrisc': openrisc_system_ss}

diff --git a/target/ppc/meson.build b/target/ppc/meson.build
index 4c2635039e3bb68e87ea9b65d26015cdf3e275e2..97ceb6e7c008e78d27da5c27af9f86787f903ff9 100644 (file)
--- a/target/ppc/meson.build
+++ b/target/ppc/meson.build
@@ -55,4 +55,4 @@ ppc_system_ss.add(when: 'TARGET_PPC64', if_true: files(
 ))
 
 target_arch += {'ppc': ppc_ss}
-target_softmmu_arch += {'ppc': ppc_system_ss}
+target_system_arch += {'ppc': ppc_system_ss}

diff --git a/target/riscv/meson.build b/target/riscv/meson.build
index 660078bda1f21b153833cb67826b4622df20cda8..ff60b21d048527bf65908d7e23e0aa2580dab897 100644 (file)
--- a/target/riscv/meson.build
+++ b/target/riscv/meson.build
@@ -39,4 +39,4 @@ riscv_system_ss.add(files(
 ))
 
 target_arch += {'riscv': riscv_ss}
-target_softmmu_arch += {'riscv': riscv_system_ss}
+target_system_arch += {'riscv': riscv_system_ss}

diff --git a/target/rx/meson.build b/target/rx/meson.build
index 8de0ad49b9b36a65dd363cf088527917043e7752..d196737ce33ccbaaa9218a2c609d4c46b782eed7 100644 (file)
--- a/target/rx/meson.build
+++ b/target/rx/meson.build
@@ -13,4 +13,4 @@ rx_ss.add(files(
   'disas.c'))
 
 target_arch += {'rx': rx_ss}
-target_softmmu_arch += {'rx': ss.source_set()}
+target_system_arch += {'rx': ss.source_set()}

diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index 42ed38942a066e9c601e6fe0d768667aaca22996..02ca43d9f00acaac14bd344d19b194978a3de89e 100644 (file)
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -40,5 +40,5 @@ subdir('tcg')
 subdir('kvm')
 
 target_arch += {'s390x': s390x_ss}
-target_softmmu_arch += {'s390x': s390x_system_ss}
+target_system_arch += {'s390x': s390x_system_ss}
 target_user_arch += {'s390x': s390x_user_ss}

diff --git a/target/sh4/meson.build b/target/sh4/meson.build
index a78e9ec7e4eeeead0296f5261687e229a10dc9ea..fe09f96684b5de59ea7bfd5cae9a38a9e0227b75 100644 (file)
--- a/target/sh4/meson.build
+++ b/target/sh4/meson.build
@@ -11,4 +11,4 @@ sh4_system_ss = ss.source_set()
 sh4_system_ss.add(files('monitor.c'))
 
 target_arch += {'sh4': sh4_ss}
-target_softmmu_arch += {'sh4': sh4_system_ss}
+target_system_arch += {'sh4': sh4_system_ss}

diff --git a/target/sparc/meson.build b/target/sparc/meson.build
index d32e67b287e74631a6620cc8313f73af4a547be2..48025cce762cd1ebaa56204ee7c4aae71031e777 100644 (file)
--- a/target/sparc/meson.build
+++ b/target/sparc/meson.build
@@ -20,4 +20,4 @@ sparc_system_ss.add(files(
 ))
 
 target_arch += {'sparc': sparc_ss}
-target_softmmu_arch += {'sparc': sparc_system_ss}
+target_system_arch += {'sparc': sparc_system_ss}

diff --git a/target/tricore/meson.build b/target/tricore/meson.build
index 34825b60481ccaf36ec74b3c6541df314c5e9f74..45f49f01288b359f3068ccfb5d9b5e17d797a353 100644 (file)
--- a/target/tricore/meson.build
+++ b/target/tricore/meson.build
@@ -12,4 +12,4 @@ tricore_ss.add(zlib)
 tricore_system_ss = ss.source_set()
 
 target_arch += {'tricore': tricore_ss}
-target_softmmu_arch += {'tricore': tricore_system_ss}
+target_system_arch += {'tricore': tricore_system_ss}

diff --git a/target/xtensa/meson.build b/target/xtensa/meson.build
index 95692bd75fd08773d3528f4310a0fa66f3f98e23..f8d60101e3d88ce8de40e0fccc20aae4db01140c 100644 (file)
--- a/target/xtensa/meson.build
+++ b/target/xtensa/meson.build
@@ -24,4 +24,4 @@ xtensa_system_ss.add(files(
 ))
 
 target_arch += {'xtensa': xtensa_ss}
-target_softmmu_arch += {'xtensa': xtensa_system_ss}
+target_system_arch += {'xtensa': xtensa_system_ss}