From f5df0b5f0874598790a60f1462f67887868bd77f Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 12 Jan 2020 11:06:21 -0500 Subject: [PATCH] gdbserver: include aarch32/aarch64 header file in corresponding source file When building gdbserver for an aarch64 host with -Wmissing-declarations, I see: CXX linux-aarch32-tdesc.o /home/simark/src/binutils-gdb/gdb/gdbserver/linux-aarch32-tdesc.c:28:1: error: no previous declaration for 'const target_desc* aarch32_linux_read_description()' [-Werror=missing-declarations] aarch32_linux_read_description () ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/simark/src/binutils-gdb/gdb/gdbserver/linux-aarch32-tdesc.c:43:1: error: no previous declaration for 'bool is_aarch32_linux_description(const target_desc*)' [-Werror=missing-declarations] is_aarch32_linux_description (const target_desc *tdesc) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ CXX linux-aarch64-tdesc.o /home/simark/src/binutils-gdb/gdb/gdbserver/linux-aarch64-tdesc.c:32:1: error: no previous declaration for 'const target_desc* aarch64_linux_read_description(uint64_t, bool)' [-Werror=missing-declarations] aarch64_linux_read_description (uint64_t vq, bool pauth_p) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fix it by including linux-aarch32-tdesc.h in linux-aarch32-tdesc.c and linux-aarch64-tdesc.h in linux-aarch64-tdesc.c. gdb/gdbserver/ChangeLog: * linux-aarch32-tdesc.c: Include linux-aarch32-tdesc.h. * linux-aarch64-tdesc.c: Include linux-aarch64-tdesc.h. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-aarch32-tdesc.c | 3 +++ gdb/gdbserver/linux-aarch64-tdesc.c | 3 +++ 3 files changed, 11 insertions(+) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index b62ed4c02b..40a765a3ed 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2020-01-12 Simon Marchi + + * linux-aarch32-tdesc.c: Include linux-aarch32-tdesc.h. + * linux-aarch64-tdesc.c: Include linux-aarch64-tdesc.h. + 2020-01-10 Pedro Alves * fork-child.c (post_fork_inferior): Pass target down to diff --git a/gdb/gdbserver/linux-aarch32-tdesc.c b/gdb/gdbserver/linux-aarch32-tdesc.c index 98d9ac8fd9..b0dffe27e7 100644 --- a/gdb/gdbserver/linux-aarch32-tdesc.c +++ b/gdb/gdbserver/linux-aarch32-tdesc.c @@ -16,6 +16,9 @@ along with this program. If not, see . */ #include "server.h" + +#include "linux-aarch32-tdesc.h" + #include "tdesc.h" #include "arch/aarch32.h" #include diff --git a/gdb/gdbserver/linux-aarch64-tdesc.c b/gdb/gdbserver/linux-aarch64-tdesc.c index 85fe4143d6..897fbb43bd 100644 --- a/gdb/gdbserver/linux-aarch64-tdesc.c +++ b/gdb/gdbserver/linux-aarch64-tdesc.c @@ -18,6 +18,9 @@ along with this program. If not, see . */ #include "server.h" + +#include "linux-aarch64-tdesc.h" + #include "tdesc.h" #include "arch/aarch64.h" #include "linux-aarch32-low.h" -- 2.34.1