From 0df670bbe009d3b57f5dbf9599913ad06013ec4e Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Wed, 17 Nov 2021 11:46:36 +0100 Subject: [PATCH] [gdb/build, s390x] Fix build after gdbarch_tdep changes Commit 345bd07cce33 ("gdb: fix gdbarch_tdep ODR violation") changes a declaration in s390-tdep.h from struct gdbarch_tdep { ... }; to struct s390_gdbarch_tdep : gdbarch_tdep { ... }; and now requires that gdbarch_tdep has been declared before. Which is usually the case, except when compiling s390-linux-nat.c, where s390-tdep.h is included before gdbarch.h. Thus the s390x build errors out with the compiler complaining about a missing class name after the colon. Fix this in s390-linux-nat.c, by including gdbarch.h before s390-tdep.h. --- gdb/s390-linux-nat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c index 8f6eb61505b..4c64a854803 100644 --- a/gdb/s390-linux-nat.c +++ b/gdb/s390-linux-nat.c @@ -29,6 +29,7 @@ #include "regset.h" #include "nat/linux-ptrace.h" #include "gdbcmd.h" +#include "gdbarch.h" #include "s390-tdep.h" #include "s390-linux-tdep.h" @@ -43,7 +44,6 @@ #include #include "inf-ptrace.h" #include "linux-tdep.h" -#include "gdbarch.h" /* Per-thread arch-specific data. */ -- 2.30.2