"propogate" -> "propagate"

[binutils-gdb.git] / bfd / newsos3.c

diff --git a/bfd/newsos3.c b/bfd/newsos3.c
index e16648f95d091c283af7e7532995237553776ce1..8a1cfc84cfa45bf30cc15e9f1dc84331252d6a39 100644 (file)
--- a/bfd/newsos3.c
+++ b/bfd/newsos3.c
@@ -1,24 +1,21 @@
-/*** bfd backend for NewsOS3 (Sony, 68k) binaries */
+/* BFD back-end for NewsOS3 (Sony, 68k) binaries.
+   Copyright (C) 1990-1991 Free Software Foundation, Inc.
 
-/* Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+This file is part of BFD, the Binary File Descriptor library.
 
-This file is part of BFD, the Binary File Diddler.
-
-BFD is free software; you can redistribute it and/or modify
+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 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-BFD is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with BFD; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#define TARGET_BYTE_ORDER_BIG_P 1
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define        PAGE_SIZE       4096
 #define        SEGMENT_SIZE    PAGE_SIZE
@@ -26,9 +23,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define ARCH 32
 #define BYTES_IN_WORD 4
 
-#include <ansidecl.h>
-#include <sysdep.h>
 #include "bfd.h"
+#include "sysdep.h"
 #include "libbfd.h"
 #include "aout64.h"
 
@@ -55,19 +51,21 @@ bfd_target *
 DEFUN(newsos3_object_p,(abfd),
      bfd *abfd)
 {
-  unsigned char magicbuf[4]; /* Raw bytes of magic number from file */
-  unsigned long magic;         /* Swapped magic number */
-
-  bfd_error = system_call_error;
+  struct external_exec exec_bytes;
+  struct internal_exec exec;
 
-  if (bfd_read ((PTR)magicbuf, 1, sizeof (magicbuf), abfd) !=
-      sizeof (magicbuf))
+  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
+      != EXEC_BYTES_SIZE) {
+    bfd_error = wrong_format;
     return 0;
-  magic = bfd_h_get_32 (abfd, magicbuf);
+  }
+
+  exec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
 
-  if (N_BADMAG (*((struct internal_exec *) &magic))) return 0;
+  if (N_BADMAG (exec)) return 0;
 
-  return aout_32_some_aout_object_p (abfd, newsos3_callback);
+  NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec);
+  return aout_32_some_aout_object_p (abfd, &exec, newsos3_callback);
 }
 
 /* Finish up the reading of a NEWS-OS a.out file header */
@@ -79,9 +77,10 @@ DEFUN(newsos3_callback,(abfd),
   
   WORK_OUT_FILE_POSITIONS(abfd, execp) ;
   
-  /* Determine the architecture and machine type of the object file.  */
-  abfd->obj_arch = bfd_arch_m68k;
-  abfd->obj_machine = 0;
+  /* Determine the architecture and machine type of the object file.
+   */
+  bfd_default_set_arch_mach(abfd, bfd_arch_m68k, 0);
+
 
   return abfd->xvec;
 }
@@ -121,7 +120,7 @@ DEFUN(newsos3_write_object_contents,(abfd),
 
 #define newsos_bfd_debug_info_start            bfd_void
 #define newsos_bfd_debug_info_end              bfd_void
-#define newsos_bfd_debug_info_accumulate       bfd_void
+#define newsos_bfd_debug_info_accumulate       (PROTO(void,(*),(bfd*, struct sec *))) bfd_void
 
 #define newsos_mkobject aout_32_mkobject 
 #define newsos_close_and_cleanup aout_32_close_and_cleanup 
@@ -143,10 +142,10 @@ DEFUN(newsos3_write_object_contents,(abfd),
 /* We define our own versions of these routines.  */
 
 
-bfd_target newsos3_vec = /* Sony 68k-based machines running newos3 */
+bfd_target newsos3_vec = /* Sony 68k-based machines running newsos3 */
 {
-  "a.out-newos3",              /* name */
-  bfd_target_aout_flavour_enum,
+  "a.out-newsos3",             /* name */
+  bfd_target_aout_flavour,
   true,                                /* target byte order */
   true,                                /* target headers byte order */
   (HAS_RELOC | EXEC_P |                /* object flags */
@@ -155,7 +154,7 @@ bfd_target newsos3_vec = /* Sony 68k-based machines running newos3 */
   (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
   ' ',                         /* ar_pad_char */
   16,                          /* ar_max_namelen */
-    1,                         /* minimum alignment */
+  1,                           /* minimum alignment */
   _do_getb64, _do_putb64,      _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* data */
   _do_getb64, _do_putb64,      _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */
 
@@ -167,4 +166,4 @@ bfd_target newsos3_vec = /* Sony 68k-based machines running newos3 */
        _bfd_write_archive_contents, bfd_false},
 
   JUMP_TABLE(newsos)
-  };
+};