Invoke aout N_* macros with pointer to struct internal_exec

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

diff --git a/bfd/freebsd.h b/bfd/freebsd.h
index 62d968202b2eba0250e0940ecee43b7ba3c7d1e1..4a180b19a8c96534129a466bbeaa03e87bd2adf2 100644 (file)
--- a/bfd/freebsd.h
+++ b/bfd/freebsd.h
@@ -25,31 +25,31 @@
 /* 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_MACHTYPE(exec) \
+#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(execp) \
        ((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))
-#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 "sysdep.h"
 #include "bfd.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)
-       N_SET_MACHTYPE (*execp, M_68K4K_NETBSD);
+       N_SET_MACHTYPE (execp, M_68K4K_NETBSD);
       else
-       N_SET_MACHTYPE (*execp, M_68K_NETBSD);
+       N_SET_MACHTYPE (execp, M_68K_NETBSD);
       break;
     case bfd_arch_sparc:
-      N_SET_MACHTYPE (*execp, M_SPARC_NETBSD);
+      N_SET_MACHTYPE (execp, M_SPARC_NETBSD);
       break;
     case bfd_arch_i386:
-      N_SET_MACHTYPE (*execp, M_386_NETBSD);
+      N_SET_MACHTYPE (execp, M_386_NETBSD);
       break;
     case bfd_arch_ns32k:
-      N_SET_MACHTYPE (*execp, M_532_NETBSD);
+      N_SET_MACHTYPE (execp, M_532_NETBSD);
       break;
     default:
-      N_SET_MACHTYPE (*execp, M_UNKNOWN);
+      N_SET_MACHTYPE (execp, M_UNKNOWN);
       break;
     }
 
-  WRITE_HEADERS(abfd, execp);
+  WRITE_HEADERS (abfd, execp);
 
   return TRUE;
 }