[binutils-gdb/gdb-11-branch] Fix some dangling references to `netbsd-tdep`

Simon Marchi simark@sourceware.org
Tue Jul 13 04:58:47 GMT 2021


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=29e079b876f0febe95d4bcb2b9ef24202b0513e9

commit 29e079b876f0febe95d4bcb2b9ef24202b0513e9
Author: John Ericson <git@JohnEricson.me>
Date:   Tue Jul 13 00:57:31 2021 -0400

    Fix some dangling references to `netbsd-tdep`
    
    These files were renamed in 1b71cfcfdc3e13a655fefa6566b5564cec044c10,
    but evidentially a few dangling references were left behind. This causes
    builds to fail:
    
        $ ./configure --target i686-netbsdelf
        $ make
        make: *** No rule to make target 'nbsd-tdep.c', needed by 'nbsd-tdep.o'.  Stop.
    
    gdb/ChangeLog:
    
            * sparc-tdep.h: Fix comment.
            * netbsd-tdep.c (nbsd_info_proc_mappings_header): Fix comment.
            (nbsd_init_abi): Fix comment.
            * configure.tgt (*-*-netbsd* | *-*-knetbsd*-gnu): Fix netbsd
            file name.
            (alpha*-*-openbsd*): Likewise.
            (sparc-*-openbsd*): Likewise.
            (sparc64-*-openbsd*): Likewise.
    
    Change-Id: I18a0873902dccadd238615577aac4e08772fa2c8

Diff:
---
 gdb/ChangeLog     | 11 +++++++++++
 gdb/configure.tgt |  8 ++++----
 gdb/netbsd-tdep.c |  4 ++--
 gdb/sparc-tdep.h  |  2 +-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 087796b8b19..23ae68ac3a5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2021-07-13  John Ericson  <git@JohnEricson.me>
+
+	* sparc-tdep.h: Fix comment.
+	* netbsd-tdep.c (nbsd_info_proc_mappings_header): Fix comment.
+	(nbsd_init_abi): Fix comment.
+	* configure.tgt (*-*-netbsd* | *-*-knetbsd*-gnu): Fix netbsd
+	file name.
+	(alpha*-*-openbsd*): Likewise.
+	(sparc-*-openbsd*): Likewise.
+	(sparc64-*-openbsd*): Likewise.
+
 2021-07-11  Tom Tromey  <tom@tromey.com>
 
 	Committed by Joel Brobecker  <brobecker@adacore.com>:
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index a928c0227a0..643973917fe 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -105,7 +105,7 @@ case "${targ}" in
 *-*-freebsd* | *-*-kfreebsd*-gnu)
 	os_obs="fbsd-tdep.o solib-svr4.o";;
 *-*-netbsd* | *-*-knetbsd*-gnu)
-	os_obs="nbsd-tdep.o solib-svr4.o";;
+	os_obs="netbsd-tdep.o solib-svr4.o";;
 *-*-openbsd*)
 	os_obs="obsd-tdep.o solib-svr4.o";;
 esac
@@ -146,7 +146,7 @@ alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
 alpha*-*-openbsd*)
 	# Target: OpenBSD/alpha
 	gdb_target_obs="alpha-mdebug-tdep.o alpha-bsd-tdep.o \
-			alpha-netbsd-tdep.o alpha-obsd-tdep.o nbsd-tdep.o"
+			alpha-netbsd-tdep.o alpha-obsd-tdep.o netbsd-tdep.o"
 	;;
 
 am33_2.0*-*-linux*)
@@ -632,14 +632,14 @@ sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu)
 sparc-*-openbsd*)
 	# Target: OpenBSD/sparc
 	gdb_target_obs="sparc-tdep.o sparc-netbsd-tdep.o sparc-obsd-tdep.o \
-			nbsd-tdep.o bsd-uthread.o \
+			netbsd-tdep.o bsd-uthread.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
 sparc64-*-openbsd*)
 	# Target: OpenBSD/sparc64
 	gdb_target_obs="sparc64-tdep.o sparc64-netbsd-tdep.o sparc64-obsd-tdep.o \
 			sparc-tdep.o sparc-netbsd-tdep.o sparc-obsd-tdep.o \
-			nbsd-tdep.o bsd-uthread.o \
+			netbsd-tdep.o bsd-uthread.o \
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	;;
 sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
diff --git a/gdb/netbsd-tdep.c b/gdb/netbsd-tdep.c
index 3b879b6856d..965ecfb0f18 100644
--- a/gdb/netbsd-tdep.c
+++ b/gdb/netbsd-tdep.c
@@ -520,7 +520,7 @@ nbsd_get_siginfo_type (struct gdbarch *gdbarch)
   return siginfo_type;
 }
 
-/* See nbsd-tdep.h.  */
+/* See netbsd-tdep.h.  */
 
 void
 nbsd_info_proc_mappings_header (int addr_bit)
@@ -607,7 +607,7 @@ nbsd_get_syscall_number (struct gdbarch *gdbarch, thread_info *thread)
   internal_error (__FILE__, __LINE__, _("nbsd_get_sycall_number called"));
 }
 
-/* See nbsd-tdep.h.  */
+/* See netbsd-tdep.h.  */
 
 void
 nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
diff --git a/gdb/sparc-tdep.h b/gdb/sparc-tdep.h
index 95f6a44a401..c0cfd09a6de 100644
--- a/gdb/sparc-tdep.h
+++ b/gdb/sparc-tdep.h
@@ -245,7 +245,7 @@ extern int sparc_is_annulled_branch_insn (CORE_ADDR pc);
 extern const struct sparc_gregmap sparc32_sol2_gregmap;
 extern const struct sparc_fpregmap sparc32_sol2_fpregmap;
 
-/* Functions and variables exported from sparcnbsd-tdep.c.  */
+/* Functions and variables exported from sparc-netbsd-tdep.c.  */
 
 /* Register offsets for NetBSD.  */
 extern const struct sparc_gregmap sparc32nbsd_gregmap;


More information about the Gdb-cvs mailing list