Re: [PATCH 1/5] bsd-user: Rename elfcore.c -> elfcore.c.inc

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

On 6/6/23 20:08, Warner Losh wrote:
> On Tue, Jun 6, 2023 at 8:29 AM Richard Henderson 
> <richard.henderson@linaro.org <mailto:richard.henderson@linaro.org>> wrote:
> 
>     On 6/6/23 07:12, Philippe Mathieu-Daudé wrote:
>      > Since commit 139c1837db ("meson: rename included C source files
>      > to .c.inc"), QEMU standard procedure for included C files is to
>      > use *.c.inc.
>      >
>      > Besides, since commit 6a0057aa22 ("docs/devel: make a statement
>      > about includes") this is documented as the Coding Style:
>      >
>      >    If you do use template header files they should be named with
>      >    the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
>      >    being included for expansion.
>      >
>      > Therefore rename the included 'elfcore.c' as 'elfcore.c.inc'.
>      >
>      > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org
>     <mailto:philmd@linaro.org>>
>      > ---
>      >   bsd-user/elfload.c                    | 2 +-
>      >   bsd-user/{elfcore.c => elfcore.c.inc} | 0
>      >   2 files changed, 1 insertion(+), 1 deletion(-)
>      >   rename bsd-user/{elfcore.c => elfcore.c.inc} (100%)
> 
>     Assuming Warner doesn't simply want to merge this small file, or
>     compile it separately. It
>     isn't actually included more than once.
> 
> 
> I'd much rather inline it in elfload.c I did the include trick as a 
> short-term
> hack so I didn't have to upstream ALL of the core dump support to get
> progress on other things in elfload.c.
> 
> So rather than rename it (which will cause some grief to me when I merge
> things, but not a huge amount), it would be better to just inline what's
> upstream now and I'll reconcile that when I upstream core dump support.

I'll just drop it in favor of yours.