Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / mipsbsd.c

diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c
index 202c23fb020813fef5b3540c6f2a15d8f62d59ee..098e7919924f58583f117a67d991bc19b4ff2939 100644 (file)
--- a/bfd/mipsbsd.c
+++ b/bfd/mipsbsd.c
@@ -1,6 +1,5 @@
 /* BFD backend for MIPS BSD (a.out) binaries.
-   Copyright 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-   2005, 2007, 2009, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1993-2017 Free Software Foundation, Inc.
    Written by Ralph Campbell.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -24,7 +23,7 @@
 /* #define ENTRY_CAN_BE_ZERO */
 #define N_HEADER_IN_TEXT(x) 1
 #define N_TXTADDR(x) \
-    (N_MAGIC(x) != ZMAGIC ? (x).a_entry :      /* object file or NMAGIC */\
+    (N_MAGIC(x) != ZMAGIC ? (x)->a_entry :     /* object file or NMAGIC */\
            TEXT_START_ADDR + EXEC_BYTES_SIZE   /* no padding */\
     )
 #define N_DATADDR(x) (N_TXTADDR(x)+N_TXTSIZE(x))
@@ -46,8 +45,8 @@
 #include "libbfd.h"
 #include "libaout.h"
 
-#define SET_ARCH_MACH(ABFD, EXEC) \
-  MY(set_arch_mach) (ABFD, N_MACHTYPE (EXEC)); \
+#define SET_ARCH_MACH(ABFD, EXECP) \
+  MY(set_arch_mach) (ABFD, N_MACHTYPE (EXECP)); \
   MY(choose_reloc_size) (ABFD);
 static void MY(set_arch_mach) (bfd *, unsigned long);
 static void MY(choose_reloc_size) (bfd *);
@@ -138,34 +137,34 @@ MY (write_object_contents) (bfd *abfd)
       switch (bfd_get_mach (abfd))
        {
        case bfd_mach_m68010:
-         N_SET_MACHTYPE (*execp, M_68010);
+         N_SET_MACHTYPE (execp, M_68010);
          break;
        default:
        case bfd_mach_m68020:
-         N_SET_MACHTYPE (*execp, M_68020);
+         N_SET_MACHTYPE (execp, M_68020);
          break;
        }
       break;
     case bfd_arch_sparc:
-      N_SET_MACHTYPE (*execp, M_SPARC);
+      N_SET_MACHTYPE (execp, M_SPARC);
       break;
     case bfd_arch_i386:
-      N_SET_MACHTYPE (*execp, M_386);
+      N_SET_MACHTYPE (execp, M_386);
       break;
     case bfd_arch_mips:
       switch (bfd_get_mach (abfd))
        {
        case bfd_mach_mips4000:
        case bfd_mach_mips6000:
-         N_SET_MACHTYPE (*execp, M_MIPS2);
+         N_SET_MACHTYPE (execp, M_MIPS2);
          break;
        default:
-         N_SET_MACHTYPE (*execp, M_MIPS1);
+         N_SET_MACHTYPE (execp, M_MIPS1);
          break;
        }
       break;
     default:
-      N_SET_MACHTYPE (*execp, M_UNKNOWN);
+      N_SET_MACHTYPE (execp, M_UNKNOWN);
     }
 
   MY (choose_reloc_size) (abfd);
@@ -399,9 +398,9 @@ static const struct aout_backend_data MY(backend_data) =
   0                            /* finish_dynamic_link */
 };
 
-extern const bfd_target aout_mips_big_vec;
+extern const bfd_target mips_aout_be_vec;
 
-const bfd_target aout_mips_little_vec =
+const bfd_target mips_aout_le_vec =
 {
     "a.out-mips-little",               /* name */
     bfd_target_aout_flavour,
@@ -438,12 +437,12 @@ const bfd_target aout_mips_little_vec =
     BFD_JUMP_TABLE_LINK (MY),
     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-    & aout_mips_big_vec,
+    & mips_aout_be_vec,
 
     MY_backend_data
   };
 
-const bfd_target aout_mips_big_vec =
+const bfd_target mips_aout_be_vec =
   {
     "a.out-mips-big",          /* name */
     bfd_target_aout_flavour,
@@ -480,7 +479,7 @@ const bfd_target aout_mips_big_vec =
     BFD_JUMP_TABLE_LINK (MY),
     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
-    & aout_mips_little_vec,
+    & mips_aout_le_vec,
 
     MY_backend_data
   };