Message ID | 20250429050010.971128-13-pierrick.bouvier@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | single-binary: compile target/arm twice | expand |
On 29/4/25 07:00, Pierrick Bouvier wrote: > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > --- > target/arm/meson.build | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/target/arm/meson.build b/target/arm/meson.build > index c39ddc4427b..89e305eb56a 100644 > --- a/target/arm/meson.build > +++ b/target/arm/meson.build > @@ -1,6 +1,6 @@ > arm_ss = ss.source_set() > +arm_common_ss = ss.source_set() Unused AFAICT. > arm_ss.add(files( > - 'cpu.c', > 'debug_helper.c', > 'gdbstub.c', > 'helper.c', > @@ -20,6 +20,7 @@ arm_ss.add(when: 'TARGET_AARCH64', > ) > > arm_system_ss = ss.source_set() > +arm_common_system_ss = ss.source_set() > arm_system_ss.add(files( > 'arch_dump.c', > 'arm-powerctl.c', > @@ -30,6 +31,9 @@ arm_system_ss.add(files( > )) > > arm_user_ss = ss.source_set() > +arm_user_ss.add(files('cpu.c')) > + > +arm_common_system_ss.add(files('cpu.c'), capstone) > > subdir('hvf') > > @@ -42,3 +46,5 @@ endif > target_arch += {'arm': arm_ss} > target_system_arch += {'arm': arm_system_ss} > target_user_arch += {'arm': arm_user_ss} > +target_common_arch += {'arm': arm_common_ss} > +target_common_system_arch += {'arm': arm_common_system_ss}
On 4/30/25 1:32 AM, Philippe Mathieu-Daudé wrote: > On 29/4/25 07:00, Pierrick Bouvier wrote: >> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> >> --- >> target/arm/meson.build | 8 +++++++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/target/arm/meson.build b/target/arm/meson.build >> index c39ddc4427b..89e305eb56a 100644 >> --- a/target/arm/meson.build >> +++ b/target/arm/meson.build >> @@ -1,6 +1,6 @@ >> arm_ss = ss.source_set() >> +arm_common_ss = ss.source_set() > > Unused AFAICT. > Yes, I was expecting some files to eventually be really common, but so far I didn't find some in target/arm. Same comment goes for the patch 3 with associated target_common libraries. I'm not sure if it's worth saving the lines (especially in main meson.build), compared to the "pain" for someone to have to write them later. I don't mind removing this though, if you think it's too bad to leave this unused. >> arm_ss.add(files( >> - 'cpu.c', >> 'debug_helper.c', >> 'gdbstub.c', >> 'helper.c', >> @@ -20,6 +20,7 @@ arm_ss.add(when: 'TARGET_AARCH64', >> ) >> >> arm_system_ss = ss.source_set() >> +arm_common_system_ss = ss.source_set() >> arm_system_ss.add(files( >> 'arch_dump.c', >> 'arm-powerctl.c', >> @@ -30,6 +31,9 @@ arm_system_ss.add(files( >> )) >> >> arm_user_ss = ss.source_set() >> +arm_user_ss.add(files('cpu.c')) >> + >> +arm_common_system_ss.add(files('cpu.c'), capstone) >> >> subdir('hvf') >> >> @@ -42,3 +46,5 @@ endif >> target_arch += {'arm': arm_ss} >> target_system_arch += {'arm': arm_system_ss} >> target_user_arch += {'arm': arm_user_ss} >> +target_common_arch += {'arm': arm_common_ss} >> +target_common_system_arch += {'arm': arm_common_system_ss} >
diff --git a/target/arm/meson.build b/target/arm/meson.build index c39ddc4427b..89e305eb56a 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -1,6 +1,6 @@ arm_ss = ss.source_set() +arm_common_ss = ss.source_set() arm_ss.add(files( - 'cpu.c', 'debug_helper.c', 'gdbstub.c', 'helper.c', @@ -20,6 +20,7 @@ arm_ss.add(when: 'TARGET_AARCH64', ) arm_system_ss = ss.source_set() +arm_common_system_ss = ss.source_set() arm_system_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', @@ -30,6 +31,9 @@ arm_system_ss.add(files( )) arm_user_ss = ss.source_set() +arm_user_ss.add(files('cpu.c')) + +arm_common_system_ss.add(files('cpu.c'), capstone) subdir('hvf') @@ -42,3 +46,5 @@ endif target_arch += {'arm': arm_ss} target_system_arch += {'arm': arm_system_ss} target_user_arch += {'arm': arm_user_ss} +target_common_arch += {'arm': arm_common_ss} +target_common_system_arch += {'arm': arm_common_system_ss}
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> --- target/arm/meson.build | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)