gas: sparc: fix collision of registers and pseudo-ops.

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

diff --git a/bfd/i386dynix.c b/bfd/i386dynix.c
index 30d24505380aaa8f9f23fe6da1a9e10a4b70f1e2..63d4ef81d2033ba7605742d1f177353c962dc18f 100644 (file)
--- a/bfd/i386dynix.c
+++ b/bfd/i386dynix.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries under dynix.
-   Copyright 1994, 1995, 2001, 2003, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -34,7 +34,7 @@
 /* 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 @@
 #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);