Re: [PATCH v2 3/4] gdb, gdbserver, gdbsupport: include early header files with `-include`

[Pedro Alves <pedro@palves.net>]

On 2024-03-23 02:14, Simon Marchi wrote:

> With this change, clangd picks up the -include option from the compile
> command, and is able to analyze the header file correctly, as it sees
> all that stuff included or defined but that -include option.  That works

but that -> by that


>  - There is one problem for gdbserver's Makefile: we do not want to
>    include server.h when building `gdbreplay.o`.  So we can't simply put
>    the `-include` in `INTERNAL_CFLAGS`.  I added the `-include` option
>    to the `COMPILE` and `IPAGENT_COMPILE` variables, and added a special
>    rule to compile `gdbreplay.o`.
> 

...


> diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
> index 45073abca493..4d29491a8721 100644
> --- a/gdbserver/Makefile.in
> +++ b/gdbserver/Makefile.in
> @@ -69,9 +69,11 @@ COMPILE.pre = $(CXX) $(CXX_DIALECT)
>  COMPILE.post = -c -o $@
>  POSTCOMPILE = @true
>  
> +INCLUDE_SERVER_H = -include $(srcdir)/server.h
> +

...

> +# Rule for gdbreplay.o.  This is the same as COMPILE, without INCLUDE_SERVER_H.
> +
> +gdbreplay.o: gdbreplay.cc
> +	$(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) $(COMPILE.post) $<

It would seem better to make gdbreplay include common-defs.h with -include, to me.  Any
reason not to do that?