On Fri, May 15, 2026 at 5:11 PM Philippe Mathieu-Daudé <[email protected]> wrote: > > Introduce a source set common to system / user. > No logical change intended. > > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > ---
Reviewed-by: Manos Pitsidianakis <[email protected]> > target/arm/meson.build | 21 +++++++++-------- > target/arm/tcg/meson.build | 48 ++++++++++++-------------------------- > 2 files changed, 26 insertions(+), 43 deletions(-) > > diff --git a/target/arm/meson.build b/target/arm/meson.build > index 4723f9f170a..e56fc943bdf 100644 > --- a/target/arm/meson.build > +++ b/target/arm/meson.build > @@ -1,6 +1,7 @@ > arm_ss = ss.source_set() > arm_common_ss = ss.source_set() > arm_common_system_ss = ss.source_set() > +arm_common_user_system_ss = ss.source_set() > arm_system_ss = ss.source_set() > arm_stubs_ss = ss.source_set() > arm_user_ss = ss.source_set() > @@ -16,6 +17,13 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files( > arm_common_ss.add(files( > 'mmuidx.c', > )) > +arm_common_user_system_ss.add(files( > + 'cpregs-gcs.c', > + 'cpregs-pmu.c', > + 'debug_helper.c', > + 'helper.c', > + 'vfp_fpscr.c', > +)) > > arm_common_system_ss.add(files( > 'arm-qmp-cmds.c', > @@ -26,11 +34,6 @@ arm_system_ss.add(when: 'CONFIG_HVF', if_true: > files('hyp_gdbstub.c')) > arm_user_ss.add(files('cpu.c')) > arm_stubs_ss.add(files('cpu32-stubs.c')) > arm_user_ss.add(files( > - 'cpregs-gcs.c', > - 'cpregs-pmu.c', > - 'debug_helper.c', > - 'helper.c', > - 'vfp_fpscr.c', > 'el2-stubs.c', > 'cpregs-omap-stub.c', > )) > @@ -45,15 +48,10 @@ arm_common_system_ss.add(files( > 'arch_dump.c', > 'arm-powerctl.c', > 'cortex-regs.c', > - 'cpregs-gcs.c', > 'cpregs-omap.c', > - 'cpregs-pmu.c', > 'cpu-irq.c', > - 'debug_helper.c', > - 'helper.c', > 'machine.c', > 'ptw.c', > - 'vfp_fpscr.c', > )) > > subdir('hvf') > @@ -65,6 +63,9 @@ else > arm_common_system_ss.add(files('tcg-stubs.c')) > endif > > +arm_user_ss.add_all(arm_common_user_system_ss) > +arm_common_system_ss.add_all(arm_common_user_system_ss) > + > target_arch += {'arm': arm_ss} > target_system_arch += {'arm': arm_system_ss} > target_user_arch += {'arm': arm_user_ss} > diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build > index 4fb2c15f7e0..9eeccb2adca 100644 > --- a/target/arm/tcg/meson.build > +++ b/target/arm/tcg/meson.build > @@ -52,59 +52,41 @@ arm_common_system_ss.add(when: 'CONFIG_ARM_V7M', if_true: > files('cpu-v7m.c')) > arm_user_ss.add(when: 'TARGET_AARCH64', if_false: files('cpu-v7m.c')) > > arm_common_ss.add(zlib) > - > arm_common_ss.add(files( > 'arith_helper.c', > 'crypto_helper.c', > )) > > -arm_common_system_ss.add( > +arm_common_user_system_ss.add( > m_nocp_d, > mve_d, > neon_d, > translate32_d, > vfp_d, > files( > - 'cpregs-at.c', > 'debug.c', > - 'gicv5-cpuif.c', > - 'hflags.c', > 'gengvec.c', > + 'hflags.c', > 'm_helper.c', > 'mve_helper.c', > 'neon_helper.c', > 'op_helper.c', > + 'translate.c', > + 'translate-m-nocp.c', > + 'translate-mve.c', > + 'translate-neon.c', > + 'translate-vfp.c', > + 'vec_helper.c', > + 'vfp_helper.c', > +)) > + > +arm_common_system_ss.add(files( > + 'cpregs-at.c', > + 'gicv5-cpuif.c', > 'psci.c', > 'tlb_helper.c', > 'tlb-insns.c', > - 'translate.c', > - 'translate-m-nocp.c', > - 'translate-mve.c', > - 'translate-neon.c', > - 'translate-vfp.c', > - 'vec_helper.c', > - 'vfp_helper.c', > )) > -arm_user_ss.add( > - m_nocp_d, > - mve_d, > - neon_d, > - translate32_d, > - vfp_d, > - files( > - 'debug.c', > - 'gengvec.c', > - 'hflags.c', > - 'm_helper.c', > - 'mve_helper.c', > - 'neon_helper.c', > - 'op_helper.c', > +arm_user_ss.add(files( > 'tlb_helper.c', > - 'translate.c', > - 'translate-m-nocp.c', > - 'translate-mve.c', > - 'translate-neon.c', > - 'translate-vfp.c', > - 'vec_helper.c', > - 'vfp_helper.c', > )) > -- > 2.53.0 >
