[pushed,1/2] gdbserver: include aarch32/aarch64 header file in corresponding source file

Message ID 20200112160754.290232-1-simon.marchi@polymtl.ca
State New
Headers show
Series
  • [pushed,1/2] gdbserver: include aarch32/aarch64 header file in corresponding source file
Related show

Commit Message

Simon Marchi Jan. 12, 2020, 4:07 p.m.
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(+)

-- 
2.24.1

Patch

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b62ed4c02b47..40a765a3eded 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@ 
+2020-01-12  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* linux-aarch32-tdesc.c: Include linux-aarch32-tdesc.h.
+	* linux-aarch64-tdesc.c: Include linux-aarch64-tdesc.h.
+
 2020-01-10  Pedro Alves  <palves@redhat.com>
 
 	* 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 98d9ac8fd95e..b0dffe27e711 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 <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
+
+#include "linux-aarch32-tdesc.h"
+
 #include "tdesc.h"
 #include "arch/aarch32.h"
 #include <inttypes.h>
diff --git a/gdb/gdbserver/linux-aarch64-tdesc.c b/gdb/gdbserver/linux-aarch64-tdesc.c
index 85fe4143d6ad..897fbb43bd28 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 <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
+
+#include "linux-aarch64-tdesc.h"
+
 #include "tdesc.h"
 #include "arch/aarch64.h"
 #include "linux-aarch32-low.h"