Fix build breakage from last commit (window-nat.c:windows_create_inferior)

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

diff --git a/bfd/freebsd.h b/bfd/freebsd.h
index 6d577ea4afbc150f432d91ce6431f8f763458ef7..5126b6a5601fad8663a50232c4b742ed9cea3246 100644 (file)
--- a/bfd/freebsd.h
+++ b/bfd/freebsd.h
@@ -1,12 +1,11 @@
 /* BFD back-end definitions used by all FreeBSD targets.
 /* BFD back-end definitions used by all FreeBSD targets.

-   Copyright 1990, 1991, 1992, 1996, 1997, 2000, 2001, 2002, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2017 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
-   USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
+

 
 /* FreeBSD ZMAGIC files never have the header in the text. */
 #define        N_HEADER_IN_TEXT(x)     0
 
 /* FreeBSD ZMAGIC files never have the header in the text. */
 #define        N_HEADER_IN_TEXT(x)     0


@@ -25,34 +25,34 @@
 /* ZMAGIC files start at offset 0.  Does not apply to QMAGIC files. */
 #define TEXT_START_ADDR                0
 
 /* ZMAGIC files start at offset 0.  Does not apply to QMAGIC files. */
 #define TEXT_START_ADDR                0
 

-#define N_GETMAGIC_NET(exec) \
-       ((exec).a_info & 0xffff)
-#define N_GETMID_NET(exec) \
-       (((exec).a_info >> 16) & 0x3ff)
-#define N_GETFLAG_NET(ex) \
-       (((exec).a_info >> 26) & 0x3f)
+#define N_GETMAGIC_NET(execp) \
+       ((execp)->a_info & 0xffff)
+#define N_GETMID_NET(execp) \
+       (((execp)->a_info >> 16) & 0x3ff)
+#define N_GETFLAG_NET(exexp) \
+       (((execp)->a_info >> 26) & 0x3f)

 
 

-#define N_MACHTYPE(exec) \
+#define N_MACHTYPE(execp) \

        ((enum machine_type) \
        ((enum machine_type) \

-        ((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETMID_NET (exec) : \
-         ((exec).a_info >> 16) & 0x3ff))
-#define N_FLAGS(exec) \
-       ((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETFLAG_NET (exec) : \
-        ((exec).a_info >> 26) & 0x3f)
-
-#define N_SET_INFO(exec, magic, type, flags) \
-       ((exec).a_info = ((magic) & 0xffff) \
+        ((N_GETMAGIC_NET (execp) == ZMAGIC) ? N_GETMID_NET (execp) : \
+         ((execp)->a_info >> 16) & 0x3ff))
+#define N_FLAGS(execp) \
+       ((N_GETMAGIC_NET (execp) == ZMAGIC) ? N_GETFLAG_NET (execp) : \
+        ((execp)->a_info >> 26) & 0x3f)
+
+#define N_SET_INFO(execp, magic, type, flags) \
+       ((execp)->a_info = ((magic) & 0xffff) \

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

-#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 & 0x03f) << 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"
 


@@ -82,25 +82,25 @@ MY (write_object_contents) (bfd *abfd)
     {
     case bfd_arch_m68k:
       if (strcmp (abfd->xvec->name, "a.out-m68k4k-netbsd") == 0)
     {
     case bfd_arch_m68k:
       if (strcmp (abfd->xvec->name, "a.out-m68k4k-netbsd") == 0)

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

       else
       else

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

       break;
     case bfd_arch_sparc:
       break;
     case bfd_arch_sparc:

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

       break;
     case bfd_arch_i386:
       break;
     case bfd_arch_i386:

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

       break;
     case bfd_arch_ns32k:
       break;
     case bfd_arch_ns32k:

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

       break;
     default:
       break;
     default:

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

       break;
     }
 
       break;
     }
 

-  WRITE_HEADERS(abfd, execp);
+  WRITE_HEADERS (abfd, execp);

 
   return TRUE;
 }
 
   return TRUE;
 }