Re: [PATCH 119/150] meson: convert hw/cpu

[Philippe Mathieu-Daudé]

On 8/17/20 4:40 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/Makefile.objs     | 1 -
>  hw/cpu/Makefile.objs | 5 -----
>  hw/cpu/meson.build   | 6 ++++++
>  hw/meson.build       | 1 +
>  4 files changed, 7 insertions(+), 6 deletions(-)
>  delete mode 100644 hw/cpu/Makefile.objs
>  create mode 100644 hw/cpu/meson.build
> 
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 6fce6a1473..97ad30295e 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -5,7 +5,6 @@ devices-dirs-y += adc/
>  devices-dirs-y += audio/
>  devices-dirs-y += block/
>  devices-dirs-y += char/
> -devices-dirs-y += cpu/
>  endif
>  
>  common-obj-y += $(devices-dirs-y)
> diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
> deleted file mode 100644
> index 8db9e8a7b3..0000000000
> --- a/hw/cpu/Makefile.objs
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o
> -obj-$(CONFIG_REALVIEW) += realview_mpcore.o
> -obj-$(CONFIG_A9MPCORE) += a9mpcore.o
> -obj-$(CONFIG_A15MPCORE) += a15mpcore.o
> -common-obj-y += core.o cluster.o
> diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build
> new file mode 100644
> index 0000000000..9e52fee9e7
> --- /dev/null
> +++ b/hw/cpu/meson.build
> @@ -0,0 +1,6 @@
> +softmmu_ss.add(files('core.c', 'cluster.c'))
> +
> +specific_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
> +specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
> +specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c'))
> +specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))
> diff --git a/hw/meson.build b/hw/meson.build
> index dacd26c561..103da4840b 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -1,4 +1,5 @@
>  subdir('core')
> +subdir('cpu')
>  subdir('display')
>  subdir('dma')
>  subdir('gpio')
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>