[PATCH] Hurd: do not include defs.h when compiling MiG stubs since they are compiled as C files

[PATCH] Hurd: do not include defs.h when compiling MiG stubs since they are compiled as C files

[Flavio Cruz]

Otherwise, GDB will fail to compile for Hurd.
---
 gdb/Makefile.in            | 3 ++-
 gdb/config/i386/i386gnu.mn | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6f7f2af31e5..65910d9774d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -603,11 +603,12 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
 # your system doesn't have fcntl.h in /usr/include (which is where it
 # should be according to Posix).
 DEFS = @DEFS@
+GDB_INCLUDED_HEADER = -include $(srcdir)/defs.h
 GDB_CFLAGS = \
 	-I. \
 	-I$(srcdir) \
 	-I$(srcdir)/config \
-	-include $(srcdir)/defs.h \
+	$(GDB_INCLUDED_HEADER) \
 	-DLOCALEDIR="\"$(localedir)\"" \
 	$(DEFS)
 
diff --git a/gdb/config/i386/i386gnu.mn b/gdb/config/i386/i386gnu.mn
index b7414e3bcb4..e90c7fe8d40 100644
--- a/gdb/config/i386/i386gnu.mn
+++ b/gdb/config/i386/i386gnu.mn
@@ -21,7 +21,9 @@ MIGCOM = $(MIG) -cc cat - /dev/null
 	| $(MIGCOM) -sheader /dev/null -server /dev/null -user $*_U.c -header $*_U.h
 
 # MIG stubs are not yet ready for C++ compilation.
-%_S.o %_U.o : COMPILE.post += -x c -include gnu-nat-mig.h
+%_S.o %_U.o : COMPILE.post += -x c
+# Do not include defs.h since it requires C++. Rather include our own gnu-nat-mig.h
+%_S.o %_U.o : GDB_INCLUDED_HEADER = -include gnu-nat-mig.h
 
 NAT_GENERATED_FILES = notify_S.h notify_S.c \
 	process_reply_S.h process_reply_S.c \
-- 
2.45.2

Re: [PATCH] Hurd: do not include defs.h when compiling MiG stubs since they are compiled as C files

[Tom Tromey]

>>>>> "Flavio" == Flavio Cruz <flaviocruz@gmail.com> writes:

Flavio> Otherwise, GDB will fail to compile for Hurd.

Is this still relevant / necessary?

If so it seems fine to me.

Tom

Re: [PATCH] Hurd: do not include defs.h when compiling MiG stubs since they are compiled as C files

[Flávio Cruz]

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

On Tue, Dec 17, 2024 at 11:45 AM Tom Tromey <tom@tromey.com> wrote:

> >>>>> "Flavio" == Flavio Cruz <flaviocruz@gmail.com> writes:
>
> Flavio> Otherwise, GDB will fail to compile for Hurd.
>
> Is this still relevant / necessary?


Yes, this is still relevant and can be applied cleanly.

Thanks!


>
> If so it seems fine to me.
>
> Tom
>

Re: [PATCH] Hurd: do not include defs.h when compiling MiG stubs since they are compiled as C files

[Tom Tromey]

Flávio> Yes, this is still relevant and can be applied cleanly.

Thank you.  I'm pushing it now.

Tom