[PATCH v2 0/2] single-binary: compile hw/intc/arm* files once

[PATCH v2 0/2] single-binary: compile hw/intc/arm* files once

[Pierrick Bouvier]

We simply compile them as target common code, without moving them to hw/arm.

Pierrick Bouvier (2):
  hw/meson: enter target hw first
  hw/intc: compile some arm related source once

 hw/intc/meson.build |  6 +++---
 hw/meson.build      | 45 +++++++++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

-- 
2.47.2

[PATCH v2 1/2] hw/meson: enter target hw first

[Pierrick Bouvier]

We can reuse target source sets for "generic" devices that are related
to a single architecture (like interrupt controllers).

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 hw/meson.build | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/hw/meson.build b/hw/meson.build
index 791ce21ab42..1022bdb8069 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,26 @@
+# Enter target code first to reuse variables associated
+subdir('alpha')
+subdir('arm')
+subdir('avr')
+subdir('hppa')
+subdir('xenpv') # i386 uses it
+subdir('i386')
+subdir('loongarch')
+subdir('m68k')
+subdir('microblaze')
+subdir('mips')
+subdir('openrisc')
+subdir('ppc')
+subdir('remote')
+subdir('riscv')
+subdir('rx')
+subdir('s390x')
+subdir('sh4')
+subdir('sparc')
+subdir('sparc64')
+subdir('tricore')
+subdir('xtensa')
+
 subdir('9pfs')
 subdir('acpi')
 subdir('adc')
@@ -44,26 +67,4 @@ subdir('virtio')
 subdir('vmapple')
 subdir('watchdog')
 subdir('xen')
-subdir('xenpv')
 subdir('fsi')
-
-subdir('alpha')
-subdir('arm')
-subdir('avr')
-subdir('hppa')
-subdir('i386')
-subdir('loongarch')
-subdir('m68k')
-subdir('microblaze')
-subdir('mips')
-subdir('openrisc')
-subdir('ppc')
-subdir('remote')
-subdir('riscv')
-subdir('rx')
-subdir('s390x')
-subdir('sh4')
-subdir('sparc')
-subdir('sparc64')
-subdir('tricore')
-subdir('xtensa')
-- 
2.47.2

Re: [PATCH v2 1/2] hw/meson: enter target hw first

[Philippe Mathieu-Daudé]

On 1/8/25 19:40, Pierrick Bouvier wrote:
> We can reuse target source sets for "generic" devices that are related
> to a single architecture (like interrupt controllers).
> 
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>   hw/meson.build | 45 +++++++++++++++++++++++----------------------
>   1 file changed, 23 insertions(+), 22 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH v2 2/2] hw/intc: compile some arm related source once

[Pierrick Bouvier]

Let kvm related gic file out for now, as they are compiled only on
aarch64 hosts.

Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 hw/intc/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index 3137521a4ad..3efb276b6e6 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -38,11 +38,11 @@ if config_all_devices.has_key('CONFIG_APIC') or \
 endif
 
 specific_ss.add(when: 'CONFIG_APIC', if_true: files('apic.c', 'apic_common.c'))
-specific_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c'))
-specific_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c'))
+arm_common_ss.add(when: 'CONFIG_ARM_GIC', if_true: files('arm_gicv3_cpuif_common.c'))
+arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c'))
 specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c'))
 specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c'))
-specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c'))
+arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c'))
 specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c'))
 specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c'))
 specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_liointc.c'))
-- 
2.47.2

Re: [PATCH v2 0/2] single-binary: compile hw/intc/arm* files once

[Pierrick Bouvier]

On 2025-08-01 10:40, Pierrick Bouvier wrote:
> We simply compile them as target common code, without moving them to hw/arm.
> 
> Pierrick Bouvier (2):
>    hw/meson: enter target hw first
>    hw/intc: compile some arm related source once
> 
>   hw/intc/meson.build |  6 +++---
>   hw/meson.build      | 45 +++++++++++++++++++++++----------------------
>   2 files changed, 26 insertions(+), 25 deletions(-)
> 


Ping on this series.
I'll be out next week, but it should be ready to be pulled once the 
trunk reopens.

Regards,
Pierrick

Re: [PATCH v2 0/2] single-binary: compile hw/intc/arm* files once

[Peter Maydell]

On Fri, 22 Aug 2025 at 15:31, Pierrick Bouvier
<pierrick.bouvier@linaro.org> wrote:
>
> On 2025-08-01 10:40, Pierrick Bouvier wrote:
> > We simply compile them as target common code, without moving them to hw/arm.
> >
> > Pierrick Bouvier (2):
> >    hw/meson: enter target hw first
> >    hw/intc: compile some arm related source once
> >
> >   hw/intc/meson.build |  6 +++---
> >   hw/meson.build      | 45 +++++++++++++++++++++++----------------------
> >   2 files changed, 26 insertions(+), 25 deletions(-)
> >
>
>
> Ping on this series.
> I'll be out next week, but it should be ready to be pulled once the
> trunk reopens.

Philippe -- I'm assuming you'll pick this up as part of
the single-binary work. Let me know if you'd rather it
goes via target-arm.

-- PMM

Re: [PATCH v2 0/2] single-binary: compile hw/intc/arm* files once

[Philippe Mathieu-Daudé]

On 1/9/25 18:23, Peter Maydell wrote:
> On Fri, 22 Aug 2025 at 15:31, Pierrick Bouvier
> <pierrick.bouvier@linaro.org> wrote:
>>
>> On 2025-08-01 10:40, Pierrick Bouvier wrote:
>>> We simply compile them as target common code, without moving them to hw/arm.
>>>
>>> Pierrick Bouvier (2):
>>>     hw/meson: enter target hw first
>>>     hw/intc: compile some arm related source once
>>>
>>>    hw/intc/meson.build |  6 +++---
>>>    hw/meson.build      | 45 +++++++++++++++++++++++----------------------
>>>    2 files changed, 26 insertions(+), 25 deletions(-)
>>>
>>
>>
>> Ping on this series.
>> I'll be out next week, but it should be ready to be pulled once the
>> trunk reopens.
> 
> Philippe -- I'm assuming you'll pick this up as part of
> the single-binary work. Let me know if you'd rather it
> goes via target-arm.

Oh, since the topic is ARM devices, I thought you'd take it,
or provide an Acked-by otherwise ;) I'll queue it directly to
save us time. Thanks!

Re: [PATCH v2 0/2] single-binary: compile hw/intc/arm* files once

[Philippe Mathieu-Daudé]

On 1/8/25 19:40, Pierrick Bouvier wrote:

> Pierrick Bouvier (2):
>    hw/meson: enter target hw first
>    hw/intc: compile some arm related source once

Series:
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>