Fix crash when exiting TUI with gdb -tui

[deliverable/binutils-gdb.git] / bfd / netbsd.h

diff --git a/bfd/netbsd.h b/bfd/netbsd.h
index f08f5f1fa429365e2cee61c05ba0fb20352d90f4..147918f94b4997d7f039646ab5fff1076f71084f 100644 (file)
--- a/bfd/netbsd.h
+++ b/bfd/netbsd.h
@@ -1,12 +1,11 @@
 /* BFD back-end definitions used by all NetBSD targets.
 /* BFD back-end definitions used by all NetBSD targets.

-   Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2020 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,8 +15,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02110-1301,
-   USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+

 
 /* Check for our machine type (part of magic number).  */
 #ifndef MACHTYPE_OK
 
 /* Check for our machine type (part of magic number).  */
 #ifndef MACHTYPE_OK


@@ -31,27 +31,27 @@
 #define N_HEADER_IN_TEXT(x)    1
 
 /* Determine if this is a shared library using the flags.  */
 #define N_HEADER_IN_TEXT(x)    1
 
 /* Determine if this is a shared library using the flags.  */

-#define N_SHARED_LIB(x)        (N_DYNAMIC (x))
+#define N_SHARED_LIB(x)                (N_DYNAMIC (x))

 
 /* We have 6 bits of flags and 10 bits of machine ID.  */
 
 /* We have 6 bits of flags and 10 bits of machine ID.  */

-#define N_MACHTYPE(exec) \
-       ((enum machine_type) (((exec).a_info >> 16) & 0x03ff))
-#define N_FLAGS(exec) \
-       (((exec).a_info >> 26) & 0x3f)
+#define N_MACHTYPE(execp) \
+       ((enum machine_type) (((execp)->a_info >> 16) & 0x03ff))
+#define N_FLAGS(execp) \
+       (((execp)->a_info >> 26) & 0x3f)

 
 

-#define N_SET_INFO(exec, magic, type, flags) \
-       ((exec).a_info = ((magic) & 0xffff) \
+#define N_SET_INFO(execp, magic, type, flags) \
+       ((execp)->a_info = ((magic) & 0xffff) \

         | (((int) (type) & 0x3ff) << 16) \
         | (((flags) & 0x3f) << 24))
         | (((int) (type) & 0x3ff) << 16) \
         | (((flags) & 0x3f) << 24))

-#define N_SET_MACHTYPE(exec, machtype) \
-       ((exec).a_info = \
-         ((exec).a_info & 0xfb00ffff) | ((((int) (machtype)) & 0x3ff) << 16))
-#define N_SET_FLAGS(exec, flags) \
-       ((exec).a_info = \
-        ((exec).a_info & 0x03ffffff) | ((flags & 0x03f) << 26))
+#define N_SET_MACHTYPE(execp, machtype) \
+       ((execp)->a_info = \
+        ((execp)->a_info & 0xfb00ffff) | ((((int) (machtype)) & 0x3ff) << 16))
+#define N_SET_FLAGS(execp, flags) \
+       ((execp)->a_info = \
+        ((execp)->a_info & 0x03ffffff) | ((flags & 0x3fu) << 26))

 
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "libaout.h"
 
 #include "libbfd.h"
 #include "libaout.h"
 


@@ -84,12 +84,7 @@ MY (write_object_contents) (bfd *abfd)
      will normally have been done by set_section_contents, but only if
      there actually are some section contents.  */
   if (! abfd->output_has_begun)
      will normally have been done by set_section_contents, but only if
      there actually are some section contents.  */
   if (! abfd->output_has_begun)

-    {
-      bfd_size_type text_size;
-      file_ptr text_end;
-
-      NAME (aout, adjust_sizes_and_vmas) (abfd, & text_size, & text_end);
-    }
+    NAME (aout, adjust_sizes_and_vmas) (abfd);

 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
 
 
   obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
 


@@ -97,19 +92,19 @@ MY (write_object_contents) (bfd *abfd)
   switch (bfd_get_arch(abfd))
     {
     case DEFAULT_ARCH:
   switch (bfd_get_arch(abfd))
     {
     case DEFAULT_ARCH:

-      N_SET_MACHTYPE(*execp, DEFAULT_MID);
+      N_SET_MACHTYPE (execp, DEFAULT_MID);

       break;
     default:
       break;
     default:

-      N_SET_MACHTYPE(*execp, M_UNKNOWN);
+      N_SET_MACHTYPE (execp, M_UNKNOWN);

       break;
     }
 
       break;
     }
 

-  /* The NetBSD magic number is always big-endian */
+  /* The NetBSD magic number is always big-endian.  */

 #ifndef TARGET_IS_BIG_ENDIAN_P
   /* XXX aren't there any macro to change byteorder of a word independent of
 #ifndef TARGET_IS_BIG_ENDIAN_P
   /* XXX aren't there any macro to change byteorder of a word independent of

-     the host's or target's endianesses?  */
+     the host's or target's endiannesses?  */

   execp->a_info
   execp->a_info

-    = (execp->a_info & 0xff) << 24 | (execp->a_info & 0xff00) << 8
+    = (execp->a_info & 0xffu) << 24 | (execp->a_info & 0xff00) << 8

       | (execp->a_info & 0xff0000) >> 8 | (execp->a_info & 0xff000000) >> 24;
 #endif
 
       | (execp->a_info & 0xff0000) >> 8 | (execp->a_info & 0xff000000) >> 24;
 #endif