[PATCH] Fix some dangling references to `netbsd-tdep`

[PATCH] Fix some dangling references to `netbsd-tdep`

[John Ericson]

These files were renamed in 1b71cfcfdc3e13a655fefa6566b5564cec044c10,
but evidentially a few dangling references were left behind.

N.B. Originally submitted to the binutils list by mistake as
https://sourceware.org/pipermail/binutils/2021-June/117186.html , and
then to the non-patch GDB list as
https://sourceware.org/pipermail/gdb/2021-July/049547.html . I am sorry,
still getting used to this thing.
---
 gdb/configure.tgt | 8 ++++----
 gdb/netbsd-tdep.c | 4 ++--
 gdb/sparc-tdep.h  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

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;
-- 
2.31.1

Re: [PATCH] Fix some dangling references to `netbsd-tdep`

[Simon Marchi]

On 2021-07-01 10:46 a.m., John Ericson wrote:
> These files were renamed in 1b71cfcfdc3e13a655fefa6566b5564cec044c10,
> but evidentially a few dangling references were left behind.
> 
> N.B. Originally submitted to the binutils list by mistake as
> https://sourceware.org/pipermail/binutils/2021-June/117186.html , and
> then to the non-patch GDB list as
> https://sourceware.org/pipermail/gdb/2021-July/049547.html . I am sorry,
> still getting used to this thing.

Hi!

No worries, as long as you learn in the process.  It will go smoother
next time.

> ---
>  gdb/configure.tgt | 8 ++++----
>  gdb/netbsd-tdep.c | 4 ++--
>  gdb/sparc-tdep.h  | 2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> 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*)

It sounds like the changes in configure.tgt are not like the others
(cosmetic changes in comments) but would in fact fix a build failure
when GDB is built with, say, --target=sparc64-something-openbsd (I don't
know what the actual triplets look like).  But using that gives me:

    $ make
    make: *** No rule to make target 'nbsd-tdep.c', needed by 'nbsd-tdep.o'.  Stop.

So, please mention this in the commit message, it's an important point.

Simon

[PATCH v2] Fix some dangling references to `netbsd-tdep`

[John Ericson]

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/configure.tgt | 8 ++++----
 gdb/netbsd-tdep.c | 4 ++--
 gdb/sparc-tdep.h  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

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;
-- 
2.31.1

Re: [PATCH v2] Fix some dangling references to `netbsd-tdep`

[Simon Marchi]

On 2021-07-06 9:40 a.m., John Ericson wrote:
> 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.

Thanks!  I pushed the patch for you.

It appears you don't have a copyright assignment on file.  This patch
was small / trivial enough that it didn't require one, in my opinion.
But note that if you plan on doing more substantial changes, a copyright
assignment will be needed in order to merge your patches.

Simon