Re: [PATCH v2 5/5] disas: Move disas.c into the target-independent source set

[Philippe Mathieu-Daudé]

On 10/5/23 10:13, Richard Henderson wrote:
> On 5/10/23 09:10, Thomas Huth wrote:
> > On 10/05/2023 09.46, Richard Henderson wrote:
> > > On 5/10/23 07:53, Thomas Huth wrote:
> > > > On 09/05/2023 18.33, Richard Henderson wrote:
> > > > > From: Thomas Huth <thuth@redhat.com>
> > > > >
> > > > > By using target_words_bigendian() instead of an ifdef,
> > > > > we can build this code once.
> > > > >
> > > > > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > > > > [rth: Type change done in a separate patch]
> > > > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> > > > > ---
> > > > ...
> > > > > diff --git a/disas/meson.build b/disas/meson.build
> > > > > index f40230c58f..2ae44691fa 100644
> > > > > --- a/disas/meson.build
> > > > > +++ b/disas/meson.build
> > > > > @@ -13,4 +13,5 @@ common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: 
> > > > > files('xtensa.c'))
> > > > >   common_ss.add(when: capstone, if_true: [files('capstone.c'), 
> > > > > capstone])
> > > > >   softmmu_ss.add(files('disas-mon.c'))
> > > > > -specific_ss.add(files('disas.c'), capstone)
> > > > > +common_ss.add(files('disas.c'), capstone)
> > > >
> > > > I guess you could drop the "capstone" here now since it is already 
> > > > added to common_ss now three lines earlier.
> > >
> > > I have a memory that it's required to get the include path for 
> > > <capstone.h> for "disas/capstone.h", for use by the target's 
> > > cpu_set_disas_info. Otherwise only common_ss files have access to the 
> > > include path.
> >
> > I only meant to remove it from the new 
> > "common_ss.add(files('disas.c')" line since it is already there in the 
> > "common_ss.add(when: capstone, if_true: [files('capstone.c'), 
> > capstone])" line ... I think you have to keep the 
> > "specific_ss.add(capstone)" line.
>
> Oh, yes, duplicate within common_ss.  Removed.

What the final patch looks like?