[pushed] Fix build breakage in NetBSD tdep files

Message ID 20200406184343.20504-1-tromey@adacore.com
State New
Headers show
Series
  • [pushed] Fix build breakage in NetBSD tdep files
Related show

Commit Message

Tom Tromey April 6, 2020, 6:43 p.m.
A recent patch caused some build failures in NetBSD tdep files.  I saw
this failure in my --enable-target=all build.

This patch fixes the problems.  Tested by rebuilding.
I am going to check this in.

gdb/ChangeLog
2020-04-06  Tom Tromey  <tromey@adacore.com>

	* sh-nbsd-tdep.c: Include nbsd-tdep.h.
	* ppc-nbsd-tdep.c: Include nbsd-tdep.h.
	* mips-nbsd-tdep.c (mipsnbsd_init_abi): Add missing ";".
	* arm-nbsd-tdep.c: Include nbsd-tdep.h.
	* hppa-nbsd-tdep.c: Include nbsd-tdep.h.
---
 gdb/ChangeLog        | 8 ++++++++
 gdb/arm-nbsd-tdep.c  | 1 +
 gdb/hppa-nbsd-tdep.c | 1 +
 gdb/mips-nbsd-tdep.c | 2 +-
 gdb/ppc-nbsd-tdep.c  | 3 ++-
 gdb/sh-nbsd-tdep.c   | 1 +
 gdb/vax-nbsd-tdep.c  | 1 +
 7 files changed, 15 insertions(+), 2 deletions(-)

-- 
2.21.1

Comments

Kamil Rytarowski April 6, 2020, 6:48 p.m. | #1
Thanks! I will test next time with --enable-target=all.

On 06.04.2020 20:43, Tom Tromey wrote:
> A recent patch caused some build failures in NetBSD tdep files.  I saw

> this failure in my --enable-target=all build.

>

> This patch fixes the problems.  Tested by rebuilding.

> I am going to check this in.

>

> gdb/ChangeLog

> 2020-04-06  Tom Tromey  <tromey@adacore.com>

>

> 	* sh-nbsd-tdep.c: Include nbsd-tdep.h.

> 	* ppc-nbsd-tdep.c: Include nbsd-tdep.h.

> 	* mips-nbsd-tdep.c (mipsnbsd_init_abi): Add missing ";".

> 	* arm-nbsd-tdep.c: Include nbsd-tdep.h.

> 	* hppa-nbsd-tdep.c: Include nbsd-tdep.h.

> ---

>  gdb/ChangeLog        | 8 ++++++++

>  gdb/arm-nbsd-tdep.c  | 1 +

>  gdb/hppa-nbsd-tdep.c | 1 +

>  gdb/mips-nbsd-tdep.c | 2 +-

>  gdb/ppc-nbsd-tdep.c  | 3 ++-

>  gdb/sh-nbsd-tdep.c   | 1 +

>  gdb/vax-nbsd-tdep.c  | 1 +

>  7 files changed, 15 insertions(+), 2 deletions(-)

>

> diff --git a/gdb/arm-nbsd-tdep.c b/gdb/arm-nbsd-tdep.c

> index a6104f760b3..b1e369d41c2 100644

> --- a/gdb/arm-nbsd-tdep.c

> +++ b/gdb/arm-nbsd-tdep.c

> @@ -22,6 +22,7 @@

>

>  #include "arch/arm.h"

>  #include "arm-nbsd-tdep.h"

> +#include "nbsd-tdep.h"

>  #include "arm-tdep.h"

>  #include "regset.h"

>  #include "solib-svr4.h"

> diff --git a/gdb/hppa-nbsd-tdep.c b/gdb/hppa-nbsd-tdep.c

> index d601aa96f3f..5309b1976fd 100644

> --- a/gdb/hppa-nbsd-tdep.c

> +++ b/gdb/hppa-nbsd-tdep.c

> @@ -27,6 +27,7 @@

>

>  #include "hppa-tdep.h"

>  #include "hppa-bsd-tdep.h"

> +#include "nbsd-tdep.h"

>  #include "gdbarch.h"

>

>  /* From <machine/mcontext.h>.  */

> diff --git a/gdb/mips-nbsd-tdep.c b/gdb/mips-nbsd-tdep.c

> index 6f4d22b24fb..524990a8097 100644

> --- a/gdb/mips-nbsd-tdep.c

> +++ b/gdb/mips-nbsd-tdep.c

> @@ -354,7 +354,7 @@ static void

>  mipsnbsd_init_abi (struct gdbarch_info info,

>                     struct gdbarch *gdbarch)

>  {

> -  nbsd_init_abi (info, gdbarch)

> +  nbsd_init_abi (info, gdbarch);

>

>    set_gdbarch_iterate_over_regset_sections

>      (gdbarch, mipsnbsd_iterate_over_regset_sections);

> diff --git a/gdb/ppc-nbsd-tdep.c b/gdb/ppc-nbsd-tdep.c

> index 81492deaccd..f2cca8f5458 100644

> --- a/gdb/ppc-nbsd-tdep.c

> +++ b/gdb/ppc-nbsd-tdep.c

> @@ -28,7 +28,8 @@

>  #include "tramp-frame.h"

>

>  #include "ppc-tdep.h"

> -#include "ppc-nbsd-tdep.h"

> +#include "nbsd-tdep.h"

> +#include "ppc-tdep.h"

>  #include "solib-svr4.h"

>

>  /* Register offsets from <machine/reg.h>.  */

> diff --git a/gdb/sh-nbsd-tdep.c b/gdb/sh-nbsd-tdep.c

> index 2b2a7e3fd4a..6551c47b5e1 100644

> --- a/gdb/sh-nbsd-tdep.c

> +++ b/gdb/sh-nbsd-tdep.c

> @@ -26,6 +26,7 @@

>  #include "osabi.h"

>

>  #include "sh-tdep.h"

> +#include "nbsd-tdep.h"

>  #include "solib-svr4.h"

>  #include "gdbarch.h"

>

> diff --git a/gdb/vax-nbsd-tdep.c b/gdb/vax-nbsd-tdep.c

> index 7630ac5ab94..40007f11660 100644

> --- a/gdb/vax-nbsd-tdep.c

> +++ b/gdb/vax-nbsd-tdep.c

> @@ -22,6 +22,7 @@

>  #include "osabi.h"

>

>  #include "vax-tdep.h"

> +#include "nbsd-tdep.h"

>  #include "solib-svr4.h"

>

>  /* NetBSD ELF.  */

>

Patch

diff --git a/gdb/arm-nbsd-tdep.c b/gdb/arm-nbsd-tdep.c
index a6104f760b3..b1e369d41c2 100644
--- a/gdb/arm-nbsd-tdep.c
+++ b/gdb/arm-nbsd-tdep.c
@@ -22,6 +22,7 @@ 
 
 #include "arch/arm.h"
 #include "arm-nbsd-tdep.h"
+#include "nbsd-tdep.h"
 #include "arm-tdep.h"
 #include "regset.h"
 #include "solib-svr4.h"
diff --git a/gdb/hppa-nbsd-tdep.c b/gdb/hppa-nbsd-tdep.c
index d601aa96f3f..5309b1976fd 100644
--- a/gdb/hppa-nbsd-tdep.c
+++ b/gdb/hppa-nbsd-tdep.c
@@ -27,6 +27,7 @@ 
 
 #include "hppa-tdep.h"
 #include "hppa-bsd-tdep.h"
+#include "nbsd-tdep.h"
 #include "gdbarch.h"
 
 /* From <machine/mcontext.h>.  */
diff --git a/gdb/mips-nbsd-tdep.c b/gdb/mips-nbsd-tdep.c
index 6f4d22b24fb..524990a8097 100644
--- a/gdb/mips-nbsd-tdep.c
+++ b/gdb/mips-nbsd-tdep.c
@@ -354,7 +354,7 @@  static void
 mipsnbsd_init_abi (struct gdbarch_info info,
                    struct gdbarch *gdbarch)
 {
-  nbsd_init_abi (info, gdbarch)
+  nbsd_init_abi (info, gdbarch);
 
   set_gdbarch_iterate_over_regset_sections
     (gdbarch, mipsnbsd_iterate_over_regset_sections);
diff --git a/gdb/ppc-nbsd-tdep.c b/gdb/ppc-nbsd-tdep.c
index 81492deaccd..f2cca8f5458 100644
--- a/gdb/ppc-nbsd-tdep.c
+++ b/gdb/ppc-nbsd-tdep.c
@@ -28,7 +28,8 @@ 
 #include "tramp-frame.h"
 
 #include "ppc-tdep.h"
-#include "ppc-nbsd-tdep.h"
+#include "nbsd-tdep.h"
+#include "ppc-tdep.h"
 #include "solib-svr4.h"
 
 /* Register offsets from <machine/reg.h>.  */
diff --git a/gdb/sh-nbsd-tdep.c b/gdb/sh-nbsd-tdep.c
index 2b2a7e3fd4a..6551c47b5e1 100644
--- a/gdb/sh-nbsd-tdep.c
+++ b/gdb/sh-nbsd-tdep.c
@@ -26,6 +26,7 @@ 
 #include "osabi.h"
 
 #include "sh-tdep.h"
+#include "nbsd-tdep.h"
 #include "solib-svr4.h"
 #include "gdbarch.h"
 
diff --git a/gdb/vax-nbsd-tdep.c b/gdb/vax-nbsd-tdep.c
index 7630ac5ab94..40007f11660 100644
--- a/gdb/vax-nbsd-tdep.c
+++ b/gdb/vax-nbsd-tdep.c
@@ -22,6 +22,7 @@ 
 #include "osabi.h"
 
 #include "vax-tdep.h"
+#include "nbsd-tdep.h"
 #include "solib-svr4.h"
 
 /* NetBSD ELF.  */