Re: [RFC v12 03/65] arm: tcg: only build under CONFIG_TCG

[Claudio Fontana]

On 4/13/21 10:49 PM, Philippe Mathieu-Daudé wrote:
> On 3/26/21 8:35 PM, Claudio Fontana wrote:
>> Signed-off-by: Claudio Fontana <cfontana@suse.de>
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
>> ---
>>  target/arm/tcg/meson.build | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/target/arm/tcg/meson.build b/target/arm/tcg/meson.build
>> index 0bd4e9d954..3b4146d079 100644
>> --- a/target/arm/tcg/meson.build
>> +++ b/target/arm/tcg/meson.build
>> @@ -12,9 +12,9 @@ gen = [
>>    decodetree.process('t16.decode', extra_args: ['-w', '16', 
>> '--static-decode=disas_t16']),
>>  ]
>>  
>> -arm_ss.add(gen)
>> +arm_ss.add(when: 'CONFIG_TCG', if_true: gen)
>>  
>> -arm_ss.add(files(
>> +arm_ss.add(when: 'CONFIG_TCG', if_true: files(
>>    'translate.c',
>>    'helper.c',
>>    'iwmmxt_helper.c',
>> @@ -28,7 +28,7 @@ arm_ss.add(files(
>>    'debug_helper.c',
>>  ))
>>  
>> -arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
>> +arm_ss.add(when: ['TARGET_AARCH64','CONFIG_TCG'], if_true: files(
>>    'translate-a64.c',
>>    'translate-sve.c',
>>    'helper-a64.c',
>>
> 
> Isn't it clearer to use in target/arm/meson.build:
> 
> if 'CONFIG_TCG' in config_all
>   subdir('tcg')
> endif
> 
> ?

This was my initial idea also, but now it is not possible anymore, since we now 
put some tcg stubs in tcg/.

We could instead put them in a dedicated stubs/ directory though.

The reason is basically that Paolo suggested to recurse unconditionally, I just 
considered this meson-related statement as an oracle.

Ciao,

Claudio

> 
> Similarly in the next patch for target/arm/tcg/meson.build:
> 
> if have_user
>   subdir('user')
> endif
> if have_system
>   subdir('sysemu')
> endif
>