[RFC,15/15] softmmu: Build target-agnostic objects once

Commit Message

Philippe Mathieu-Daudé May 17, 2021, 11:55 a.m. UTC

Various softmmu objects aren't target specific. Move them
to the generic softmmu source set.

For our 31 softmmu targets, this is in total 330 objects
less to build!

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 softmmu/meson.build | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

Comments

Richard Henderson May 26, 2021, 7:10 p.m. UTC | #1

On 5/17/21 4:55 AM, Philippe Mathieu-Daudé wrote:
> Various softmmu objects aren't target specific. Move them
> to the generic softmmu source set.
> 
> For our 31 softmmu targets, this is in total 330 objects
> less to build!
> 
> Signed-off-by: Philippe Mathieu-Daudé<[e-mail]>
> ---
>   softmmu/meson.build | 24 ++++++++++++------------
>   1 file changed, 12 insertions(+), 12 deletions(-)

Reviewed-by: Richard Henderson <[e-mail]>

r~

Patch

diff --git a/softmmu/meson.build b/softmmu/meson.build
index 5e578b20e6c..f98a5972d23 100644
--- a/softmmu/meson.build
+++ b/softmmu/meson.build
@@ -1,21 +1,10 @@ 
 specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
   'arch_init.c',
-  'balloon.c',
-  'cpus.c',
   'cpus-qmp.c',
-  'cpu-throttle.c',
-  'datadir.c',
-  'globals.c',
-  'physmem.c',
   'ioport.c',
-  'rtc.c',
-  'runstate.c',
   'memory.c',
-  'memory_mapping.c',
+  'physmem.c',
   'qtest.c',
-  'vl.c',
-  'cpu-timers.c',
-  'runstate-action.c',
 )])
 
 specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files(
@@ -23,9 +12,20 @@ 
 )])
 
 softmmu_ss.add(files(
+  'balloon.c',
   'bootdevice.c',
+  'cpus.c',
+  'cpu-throttle.c',
+  'cpu-timers.c',
+  'datadir.c',
   'dma-helpers.c',
+  'globals.c',
+  'memory_mapping.c',
   'qdev-monitor.c',
+  'rtc.c',
+  'runstate-action.c',
+  'runstate.c',
+  'vl.c',
 ), sdl, libpmem, libdaxctl)
 
 softmmu_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))