X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fi386dynix.c;h=63d4ef81d2033ba7605742d1f177353c962dc18f;hb=7743482350c9c97484a429070db7d994a643a9eb;hp=51f0844d196dc9910e5cff653c79b8ae251deca6;hpb=e43d48ccc3b8e9d815e704e55dd6748de2419efc;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/i386dynix.c b/bfd/i386dynix.c
index 51f0844d19..63d4ef81d2 100644
--- a/bfd/i386dynix.c
+++ b/bfd/i386dynix.c
@@ -1,27 +1,27 @@
 /* BFD back-end for i386 a.out binaries under dynix.
-   Copyright 1994, 1995, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   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
-(at your option) any later version.
+   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 3 of the License, or
+   (at your option) any later version.
 
-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.
+   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 this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-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 02111-1307, USA.  */
 
 /* This BFD is currently only tested with gdb, writing object files
    may not work.  */
 
-#define BYTES_IN_WORD	4
-
 #define TEXT_START_ADDR 4096
 #define TARGET_PAGE_SIZE	4096
 #define SEGMENT_SIZE	TARGET_PAGE_SIZE
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) CONCAT2 (i386dynix_,OP)
+#define MY(OP) CONCAT2 (i386_aout_dynix_,OP)
 #define TARGETNAME "a.out-i386-dynix"
 #define NAME(x,y) CONCAT3 (i386dynix,_32_,y)
 #define ARCH_SIZE 32
@@ -55,10 +55,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define a_shdrsize a_dload
 
 void
-i386dynix_32_swap_exec_header_in (abfd, raw_bytes, execp)
-     bfd *abfd;
-     struct external_exec *raw_bytes;
-     struct internal_exec *execp;
+i386dynix_32_swap_exec_header_in (bfd *abfd,
+				  struct external_exec *raw_bytes,
+				  struct internal_exec *execp)
 {
   struct external_exec *bytes = (struct external_exec *)raw_bytes;
 
@@ -66,7 +65,7 @@ i386dynix_32_swap_exec_header_in (abfd, raw_bytes, execp)
      configuration (IE for i960), so ensure that all such uninitialized
      fields are zero'd out.  There are places where two of these structs
      are memcmp'd, and thus the contents do matter. */
-  memset ((PTR) execp, 0, sizeof (struct internal_exec));
+  memset (execp, 0, sizeof (struct internal_exec));
   /* Now fill in fields in the execp, from the bytes in the raw data.  */
   execp->a_info   = H_GET_32 (abfd, bytes->e_info);
   execp->a_text   = GET_WORD (abfd, bytes->e_text);