* Most files:

	Replace DEFUN and DEFUN_VOID with K&R-style function definition.
	Indent some of them to GNU standards.

	* aout32.c, archures.c, core.c, cpu-h8300.c, cpu-i960.c,
	cpu-m68k.c, cpu-m88k.c, cpu-mips.c, cpu-vax.c, ctor.c, demo64.c,
	elf32-hppa.h, gen-aout.c, host-aout.c, init.c, libhppa.h,
	libieee.h, liboasys.h, newsos3.c, som.h, stab-syms.c, sunos.c:
	Update copyright years.

1 files changed, 281 insertions, 258 deletions

diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h
index b5dcecf..dfac4eb 100644
--- a/bfd/aoutf1.h
+++ b/bfd/aoutf1.h
@@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "libbfd.h"
 
 #include "aout/sun4.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
+#include "libaout.h"		/* BFD a.out internal data structures */
 
 #include "aout/aout64.h"
 #include "aout/stab_gnu.h"
@@ -49,7 +49,7 @@ int in the target format. It changes the sizes of the structs which
 perform the memory/disk mapping of structures.
 
 The 64 bit backend may only be used if the host compiler supports 64
-ints (eg long long with gcc), by defining the name @code{HOST_64_BIT} in @code{bfd.h}.
+ints (eg long long with gcc), by defining the name @code{BFD_HOST_64_BIT} in @code{bfd.h}.
 With this name defined, @emph{all} bfd operations are performed with 64bit
 arithmetic, not just those to a 64bit target.
 
@@ -64,60 +64,62 @@ The name put into the target vector.
 /*SUPPRESS529*/
 
 void
-DEFUN(NAME(sunos,set_arch_mach), (abfd, machtype),
-      bfd *abfd AND int machtype)
+  NAME (sunos, set_arch_mach) (abfd, machtype)
+     bfd *abfd;
+     int machtype;
 {
   /* Determine the architecture and machine type of the object file.  */
   enum bfd_architecture arch;
   long machine;
-  switch (machtype) {
+  switch (machtype)
+    {
 
-  case M_UNKNOWN:
+    case M_UNKNOWN:
       /* Some Sun3s make magic numbers without cpu types in them, so
 	 we'll default to the 68000. */
-    arch = bfd_arch_m68k;
-    machine = 68000;
-    break;
-    
-  case M_68010:
-  case M_HP200:
-    arch = bfd_arch_m68k;
-    machine = 68010;
-    break;
-    
-  case M_68020:
-  case M_HP300:
-    arch = bfd_arch_m68k;
-    machine = 68020;
-    break;
-    
-  case M_SPARC:
-    arch = bfd_arch_sparc;
-    machine = 0;
-    break;
-    
-  case M_386:
-  case M_386_DYNIX:
-    arch = bfd_arch_i386;
-    machine = 0;
-    break;
-    
-  case M_29K:
-    arch = bfd_arch_a29k;
-    machine = 0;
-    break;
-    
-  case M_HPUX:
-    arch = bfd_arch_m68k;
-    machine = 0;
-    break;
-
-  default:
-    arch = bfd_arch_obscure;
-    machine = 0;
-    break;
-  }
-  bfd_set_arch_mach(abfd, arch, machine);  
+      arch = bfd_arch_m68k;
+      machine = 68000;
+      break;
+
+    case M_68010:
+    case M_HP200:
+      arch = bfd_arch_m68k;
+      machine = 68010;
+      break;
+
+    case M_68020:
+    case M_HP300:
+      arch = bfd_arch_m68k;
+      machine = 68020;
+      break;
+
+    case M_SPARC:
+      arch = bfd_arch_sparc;
+      machine = 0;
+      break;
+
+    case M_386:
+    case M_386_DYNIX:
+      arch = bfd_arch_i386;
+      machine = 0;
+      break;
+
+    case M_29K:
+      arch = bfd_arch_a29k;
+      machine = 0;
+      break;
+
+    case M_HPUX:
+      arch = bfd_arch_m68k;
+      machine = 0;
+      break;
+
+    default:
+      arch = bfd_arch_obscure;
+      machine = 0;
+      break;
+    }
+  bfd_set_arch_mach (abfd, arch, machine);
 }
 
 #define SET_ARCH_MACH(ABFD, EXEC) \
@@ -126,18 +128,19 @@ DEFUN(NAME(sunos,set_arch_mach), (abfd, machtype),
 
 /* Determine the size of a relocation entry, based on the architecture */
 static void
-DEFUN(choose_reloc_size,(abfd),
-bfd *abfd)
+choose_reloc_size (abfd)
+     bfd *abfd;
 {
-  switch (bfd_get_arch(abfd)) {
-  case bfd_arch_sparc:
-  case bfd_arch_a29k:
-    obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
-    break;
-  default:
-    obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-    break;
-  }
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_sparc:
+    case bfd_arch_a29k:
+      obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
+      break;
+    default:
+      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
+      break;
+    }
 }
 
 /* Write an object file in SunOS format.
@@ -145,40 +148,41 @@ bfd *abfd)
   file header, symbols, and relocation.  */
 
 static boolean
-DEFUN(NAME(aout,sunos4_write_object_contents),
-      (abfd),
-      bfd *abfd)
+  NAME (aout, sunos4_write_object_contents) (abfd)
+     bfd *abfd;
 {
   struct external_exec exec_bytes;
   struct internal_exec *execp = exec_hdr (abfd);
-    
+
   /* Magic number, maestro, please!  */
-  switch (bfd_get_arch(abfd)) {
-  case bfd_arch_m68k:
-    switch (bfd_get_mach(abfd)) {
-    case 68010:
-      N_SET_MACHTYPE(*execp, M_68010);
+  switch (bfd_get_arch (abfd))
+    {
+    case bfd_arch_m68k:
+      switch (bfd_get_mach (abfd))
+	{
+	case 68010:
+	  N_SET_MACHTYPE (*execp, M_68010);
+	  break;
+	default:
+	case 68020:
+	  N_SET_MACHTYPE (*execp, M_68020);
+	  break;
+	}
       break;
-    default:
-    case 68020:
-      N_SET_MACHTYPE(*execp, M_68020);
+    case bfd_arch_sparc:
+      N_SET_MACHTYPE (*execp, M_SPARC);
+      break;
+    case bfd_arch_i386:
+      N_SET_MACHTYPE (*execp, M_386);
+      break;
+    case bfd_arch_a29k:
+      N_SET_MACHTYPE (*execp, M_29K);
       break;
+    default:
+      N_SET_MACHTYPE (*execp, M_UNKNOWN);
     }
-    break;
-  case bfd_arch_sparc:
-    N_SET_MACHTYPE(*execp, M_SPARC);
-    break;
-  case bfd_arch_i386:
-    N_SET_MACHTYPE(*execp, M_386);
-    break;
-  case bfd_arch_a29k:
-    N_SET_MACHTYPE(*execp, M_29K);
-    break;
-  default:
-    N_SET_MACHTYPE(*execp, M_UNKNOWN);
-  }
-    
-  choose_reloc_size(abfd);
+
+  choose_reloc_size (abfd);
 
 #if 0
   /* Some tools want this to be 0, some tools want this to be one.
@@ -187,7 +191,7 @@ DEFUN(NAME(aout,sunos4_write_object_contents),
 #else
 
   /* Fri Jun 11 14:23:31 PDT 1993
-     FIXME 
+     FIXME
      Today's optimal setting is 1.  This is a pain, since it
      reopens 1927.  This should be readdressed by creating a new
      target for each each supported, giving perhaps sun3/m68k
@@ -196,7 +200,7 @@ DEFUN(NAME(aout,sunos4_write_object_contents),
   N_SET_FLAGS (*execp, 1);
 #endif
 
-  N_SET_DYNAMIC(*execp, bfd_get_file_flags(abfd) & DYNAMIC);
+  N_SET_DYNAMIC (*execp, bfd_get_file_flags (abfd) & DYNAMIC);
 
   /* At least for SunOS, the dynamic symbols and relocs are embedded
      in the .text section, and we do not want to write them out with
@@ -259,7 +263,7 @@ DEFUN(NAME(aout,sunos4_write_object_contents),
 	}
     }
 
-  WRITE_HEADERS(abfd, execp);
+  WRITE_HEADERS (abfd, execp);
 
   return true;
 }
@@ -278,7 +282,8 @@ DEFUN(NAME(aout,sunos4_write_object_contents),
 /* But the reg structure can be gotten from the SPARC processor handbook.
   This really should be in a GNU include file though so that gdb can use
   the same info. */
-struct regs {
+struct regs
+{
   int r_psr;
   int r_pc;
   int r_npc;
@@ -306,121 +311,124 @@ struct regs {
   neither of whose size we know, WITH STUFF IN BETWEEN THEM!  We can't
   even portably access the stuff in between!  */
 
-struct external_sparc_core {
-  int c_magic;			/* Corefile magic number */
-  int c_len;			/* Sizeof (struct core) */
+struct external_sparc_core
+  {
+    int c_magic;		/* Corefile magic number */
+    int c_len;			/* Sizeof (struct core) */
 #define	SPARC_CORE_LEN	432
-  int c_regs[19];		/* General purpose registers -- MACHDEP SIZE */
-  struct external_exec c_aouthdr; /* A.out header */
-  int c_signo;			  /* Killing signal, if any */
-  int c_tsize;			  /* Text size (bytes) */
-  int c_dsize;			  /* Data size (bytes) */
-  int c_ssize;			  /* Stack size (bytes) */
-  char c_cmdname[CORE_NAMELEN + 1]; /* Command name */
-  double fp_stuff[1];		    /* external FPU state (size unknown by us) */
-  /* The type "double" is critical here, for alignment.
+    int c_regs[19];		/* General purpose registers -- MACHDEP SIZE */
+    struct external_exec c_aouthdr;	/* A.out header */
+    int c_signo;		/* Killing signal, if any */
+    int c_tsize;		/* Text size (bytes) */
+    int c_dsize;		/* Data size (bytes) */
+    int c_ssize;		/* Stack size (bytes) */
+    char c_cmdname[CORE_NAMELEN + 1];	/* Command name */
+    double fp_stuff[1];		/* external FPU state (size unknown by us) */
+    /* The type "double" is critical here, for alignment.
     SunOS declares a struct here, but the struct's alignment
       is double since it contains doubles.  */
-  int c_ucode;			/* Exception no. from u_code */
-  /* (this member is not accessible by name since we don't
+    int c_ucode;		/* Exception no. from u_code */
+    /* (this member is not accessible by name since we don't
     portably know the size of fp_stuff.) */
-};
+  };
 
-struct external_sun3_core {
-  int c_magic;			/* Corefile magic number */
-  int c_len;			/* Sizeof (struct core) */
+struct external_sun3_core
+  {
+    int c_magic;		/* Corefile magic number */
+    int c_len;			/* Sizeof (struct core) */
 #define	SUN3_CORE_LEN	826	/* As of SunOS 4.1.1 */
-  int c_regs[18];		/* General purpose registers -- MACHDEP SIZE */
-  struct external_exec c_aouthdr;	/* A.out header */
-  int c_signo;			/* Killing signal, if any */
-  int c_tsize;			/* Text size (bytes) */
-  int c_dsize;			/* Data size (bytes) */
-  int c_ssize;			/* Stack size (bytes) */
-  char c_cmdname[CORE_NAMELEN + 1]; /* Command name */
-  double fp_stuff[1];		    /* external FPU state (size unknown by us) */
-  /* The type "double" is critical here, for alignment.
+    int c_regs[18];		/* General purpose registers -- MACHDEP SIZE */
+    struct external_exec c_aouthdr;	/* A.out header */
+    int c_signo;		/* Killing signal, if any */
+    int c_tsize;		/* Text size (bytes) */
+    int c_dsize;		/* Data size (bytes) */
+    int c_ssize;		/* Stack size (bytes) */
+    char c_cmdname[CORE_NAMELEN + 1];	/* Command name */
+    double fp_stuff[1];		/* external FPU state (size unknown by us) */
+    /* The type "double" is critical here, for alignment.
     SunOS declares a struct here, but the struct's alignment
       is double since it contains doubles.  */
-  int c_ucode;			/* Exception no. from u_code */
-  /* (this member is not accessible by name since we don't
+    int c_ucode;		/* Exception no. from u_code */
+    /* (this member is not accessible by name since we don't
     portably know the size of fp_stuff.) */
-};
+  };
 
-struct internal_sunos_core {
-  int c_magic;			/* Corefile magic number */
-  int c_len;			/* Sizeof (struct core) */
-  long c_regs_pos;		/* file offset of General purpose registers */
-  int c_regs_size;		/* size of General purpose registers */
-  struct internal_exec c_aouthdr; /* A.out header */
-  int c_signo;			  /* Killing signal, if any */
-  int c_tsize;			  /* Text size (bytes) */
-  int c_dsize;			  /* Data size (bytes) */
-  int c_ssize;			  /* Stack size (bytes) */
-  bfd_vma c_stacktop;		  /* Stack top (address) */
-  char c_cmdname[CORE_NAMELEN + 1]; /* Command name */
-  long fp_stuff_pos;		/* file offset of external FPU state (regs) */
-  int fp_stuff_size;		/* Size of it */
-  int c_ucode;			/* Exception no. from u_code */
-};
+struct internal_sunos_core
+  {
+    int c_magic;		/* Corefile magic number */
+    int c_len;			/* Sizeof (struct core) */
+    long c_regs_pos;		/* file offset of General purpose registers */
+    int c_regs_size;		/* size of General purpose registers */
+    struct internal_exec c_aouthdr;	/* A.out header */
+    int c_signo;		/* Killing signal, if any */
+    int c_tsize;		/* Text size (bytes) */
+    int c_dsize;		/* Data size (bytes) */
+    int c_ssize;		/* Stack size (bytes) */
+    bfd_vma c_stacktop;		/* Stack top (address) */
+    char c_cmdname[CORE_NAMELEN + 1];	/* Command name */
+    long fp_stuff_pos;		/* file offset of external FPU state (regs) */
+    int fp_stuff_size;		/* Size of it */
+    int c_ucode;		/* Exception no. from u_code */
+  };
 
 /* byte-swap in the Sun-3 core structure */
 static void
-DEFUN(swapcore_sun3,(abfd, ext, intcore),
-      bfd *abfd AND
-      char *ext AND
-      struct internal_sunos_core *intcore)
+swapcore_sun3 (abfd, ext, intcore)
+     bfd *abfd;
+     char *ext;
+     struct internal_sunos_core *intcore;
 {
-  struct external_sun3_core *extcore = (struct external_sun3_core *)ext;
+  struct external_sun3_core *extcore = (struct external_sun3_core *) ext;
 
-  intcore->c_magic = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_magic);
-  intcore->c_len   = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_len  );
-  intcore->c_regs_pos  = (long) (((struct external_sun3_core *)0)->c_regs);
+  intcore->c_magic = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_magic);
+  intcore->c_len = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_len);
+  intcore->c_regs_pos = (long) (((struct external_sun3_core *) 0)->c_regs);
   intcore->c_regs_size = sizeof (extcore->c_regs);
-  NAME(aout,swap_exec_header_in)(abfd, &extcore->c_aouthdr,&intcore->c_aouthdr);
-  intcore->c_signo = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_signo);
-  intcore->c_tsize = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_tsize);
-  intcore->c_dsize = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_dsize);
-  intcore->c_ssize = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_ssize);
+  NAME (aout, swap_exec_header_in) (abfd, &extcore->c_aouthdr, &intcore->c_aouthdr);
+  intcore->c_signo = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_signo);
+  intcore->c_tsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_tsize);
+  intcore->c_dsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_dsize);
+  intcore->c_ssize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_ssize);
   memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
-  intcore->fp_stuff_pos = (long) (((struct external_sun3_core *)0)->fp_stuff);
+  intcore->fp_stuff_pos = (long) (((struct external_sun3_core *) 0)->fp_stuff);
   /* FP stuff takes up whole rest of struct, except c_ucode. */
   intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
-    (file_ptr)(((struct external_sun3_core *)0)->fp_stuff);
+    (file_ptr) (((struct external_sun3_core *) 0)->fp_stuff);
   /* Ucode is the last thing in the struct -- just before the end */
-  intcore->c_ucode = 
-    bfd_h_get_32 (abfd, 
-		  intcore->c_len - sizeof (extcore->c_ucode) + (unsigned char *)extcore);
-  intcore->c_stacktop = 0x0E000000; /* By experimentation */
+  intcore->c_ucode =
+    bfd_h_get_32 (abfd,
+    intcore->c_len - sizeof (extcore->c_ucode) + (unsigned char *) extcore);
+  intcore->c_stacktop = 0x0E000000;	/* By experimentation */
 }
 
 
 /* byte-swap in the Sparc core structure */
 static void
-DEFUN(swapcore_sparc,(abfd, ext, intcore),
-      bfd *abfd AND
-      char *ext AND
-      struct internal_sunos_core *intcore)
+swapcore_sparc (abfd, ext, intcore)
+     bfd *abfd;
+     char *ext;
+     struct internal_sunos_core *intcore;
 {
-  struct external_sparc_core *extcore = (struct external_sparc_core *)ext;
-  
-  intcore->c_magic = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_magic);
-  intcore->c_len   = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_len  );
-  intcore->c_regs_pos  = (long) (((struct external_sparc_core *)0)->c_regs);
+  struct external_sparc_core *extcore = (struct external_sparc_core *) ext;
+
+  intcore->c_magic = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_magic);
+  intcore->c_len = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_len);
+  intcore->c_regs_pos = (long) (((struct external_sparc_core *) 0)->c_regs);
   intcore->c_regs_size = sizeof (extcore->c_regs);
-  NAME(aout,swap_exec_header_in)(abfd, &extcore->c_aouthdr,&intcore->c_aouthdr);
-  intcore->c_signo = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_signo);
-  intcore->c_tsize = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_tsize);
-  intcore->c_dsize = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_dsize);
-  intcore->c_ssize = bfd_h_get_32 (abfd, (unsigned char *)&extcore->c_ssize);
+  NAME (aout, swap_exec_header_in) (abfd, &extcore->c_aouthdr, &intcore->c_aouthdr);
+  intcore->c_signo = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_signo);
+  intcore->c_tsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_tsize);
+  intcore->c_dsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_dsize);
+  intcore->c_ssize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_ssize);
   memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
-  intcore->fp_stuff_pos = (long) (((struct external_sparc_core *)0)->fp_stuff);
+  intcore->fp_stuff_pos = (long) (((struct external_sparc_core *) 0)->fp_stuff);
   /* FP stuff takes up whole rest of struct, except c_ucode. */
   intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
-    (file_ptr)(((struct external_sparc_core *)0)->fp_stuff);
+    (file_ptr) (((struct external_sparc_core *) 0)->fp_stuff);
   /* Ucode is the last thing in the struct -- just before the end */
   intcore->c_ucode =
-    bfd_h_get_32 (abfd, 
-		  intcore->c_len - sizeof (extcore->c_ucode) + (unsigned char *)extcore);
+    bfd_h_get_32 (abfd,
+    intcore->c_len - sizeof (extcore->c_ucode) + (unsigned char *) extcore);
 
   /* Supposedly the user stack grows downward from the bottom of kernel memory.
      Presuming that this remains true, this definition will work.  */
@@ -439,7 +447,7 @@ DEFUN(swapcore_sparc,(abfd, ext, intcore),
 #define SPARC_USRSTACK_SPARC10 ((bfd_vma)0xf0000000)
   {
     bfd_vma sp = bfd_h_get_32
-      (abfd, (unsigned char *)&((struct regs *)&extcore->c_regs[0])->r_o6);
+    (abfd, (unsigned char *) &((struct regs *) &extcore->c_regs[0])->r_o6);
     if (sp < SPARC_USRSTACK_SPARC10)
       intcore->c_stacktop = SPARC_USRSTACK_SPARC10;
     else
@@ -455,8 +463,9 @@ DEFUN(swapcore_sparc,(abfd, ext, intcore),
 #define core_reg2sec(bfd) (core_hdr(bfd)->reg2_section)
 
 /* These are stored in the bfd's tdata */
-struct sun_core_struct {
-  struct internal_sunos_core *hdr;             /* core file header */
+struct sun_core_struct
+{
+  struct internal_sunos_core *hdr;	/* core file header */
   asection *data_section;
   asection *stack_section;
   asection *reg_section;
@@ -464,29 +473,32 @@ struct sun_core_struct {
 };
 
 static bfd_target *
-DEFUN(sunos4_core_file_p,(abfd),
-      bfd *abfd)
+sunos4_core_file_p (abfd)
+     bfd *abfd;
 {
   unsigned char longbuf[4];	/* Raw bytes of various header fields */
   int core_size;
   int core_mag;
   struct internal_sunos_core *core;
   char *extcore;
-  struct mergem {
-    struct sun_core_struct suncoredata;
-    struct internal_sunos_core internal_sunos_core;
-    char external_core[1];
-  } *mergem;
-  
-  if (bfd_read ((PTR)longbuf, 1, sizeof (longbuf), abfd) !=
+  struct mergem
+    {
+      struct sun_core_struct suncoredata;
+      struct internal_sunos_core internal_sunos_core;
+      char external_core[1];
+    }
+   *mergem;
+
+  if (bfd_read ((PTR) longbuf, 1, sizeof (longbuf), abfd) !=
       sizeof (longbuf))
     return 0;
   core_mag = bfd_h_get_32 (abfd, longbuf);
 
-  if (core_mag != CORE_MAGIC) return 0;
+  if (core_mag != CORE_MAGIC)
+    return 0;
 
   /* SunOS core headers can vary in length; second word is size; */
-  if (bfd_read ((PTR)longbuf, 1, sizeof (longbuf), abfd) !=
+  if (bfd_read ((PTR) longbuf, 1, sizeof (longbuf), abfd) !=
       sizeof (longbuf))
     return 0;
   core_size = bfd_h_get_32 (abfd, longbuf);
@@ -494,68 +506,76 @@ DEFUN(sunos4_core_file_p,(abfd),
   if (core_size > 20000)
     return 0;
 
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) < 0) return 0;
-
-  mergem = (struct mergem *)bfd_zalloc (abfd, core_size + sizeof (struct mergem));
-  if (mergem == NULL) {
-    bfd_error = no_memory;
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) < 0)
     return 0;
-  }
+
+  mergem = (struct mergem *) bfd_zalloc (abfd, core_size + sizeof (struct mergem));
+  if (mergem == NULL)
+    {
+      bfd_set_error (bfd_error_no_memory);
+      return 0;
+    }
 
   extcore = mergem->external_core;
 
-  if ((bfd_read ((PTR) extcore, 1, core_size, abfd)) != core_size) {
-    bfd_error = system_call_error;
-    bfd_release (abfd, (char *)mergem);
-    return 0;
-  }
+  if ((bfd_read ((PTR) extcore, 1, core_size, abfd)) != core_size)
+    {
+      bfd_set_error (bfd_error_system_call);
+      bfd_release (abfd, (char *) mergem);
+      return 0;
+    }
 
   /* Validate that it's a core file we know how to handle, due to sun
      botching the positioning of registers and other fields in a machine
      dependent way.  */
   core = &mergem->internal_sunos_core;
-  switch (core_size) {
-  case SPARC_CORE_LEN:
-    swapcore_sparc (abfd, extcore, core);
-    break;
-  case SUN3_CORE_LEN:
-    swapcore_sun3 (abfd, extcore, core);
-    break;
-  default:
-    bfd_error = system_call_error;		/* FIXME */
-    bfd_release (abfd, (char *)mergem);
-    return 0;
-  }
+  switch (core_size)
+    {
+    case SPARC_CORE_LEN:
+      swapcore_sparc (abfd, extcore, core);
+      break;
+    case SUN3_CORE_LEN:
+      swapcore_sun3 (abfd, extcore, core);
+      break;
+    default:
+      bfd_set_error (bfd_error_system_call);	/* FIXME */
+      bfd_release (abfd, (char *) mergem);
+      return 0;
+    }
 
- abfd->tdata.sun_core_data = &mergem->suncoredata;
- abfd->tdata.sun_core_data->hdr = core;
+  abfd->tdata.sun_core_data = &mergem->suncoredata;
+  abfd->tdata.sun_core_data->hdr = core;
 
   /* create the sections.  This is raunchy, but bfd_close wants to reclaim
      them */
   core_stacksec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_stacksec (abfd) == NULL) {
-  loser:
-    bfd_error = no_memory;
-    bfd_release (abfd, (char *)mergem);
-    return 0;
-  }
+  if (core_stacksec (abfd) == NULL)
+    {
+    loser:
+      bfd_set_error (bfd_error_no_memory);
+      bfd_release (abfd, (char *) mergem);
+      return 0;
+    }
   core_datasec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_datasec (abfd) == NULL) {
-  loser1:
-    bfd_release (abfd, core_stacksec (abfd));
-    goto loser;
-  }
+  if (core_datasec (abfd) == NULL)
+    {
+    loser1:
+      bfd_release (abfd, core_stacksec (abfd));
+      goto loser;
+    }
   core_regsec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_regsec (abfd) == NULL) {
-  loser2:
-    bfd_release (abfd, core_datasec (abfd));
-    goto loser1;
-  }
+  if (core_regsec (abfd) == NULL)
+    {
+    loser2:
+      bfd_release (abfd, core_datasec (abfd));
+      goto loser1;
+    }
   core_reg2sec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_reg2sec (abfd) == NULL) {
-    bfd_release (abfd, core_regsec (abfd));
-    goto loser2;
-  }
+  if (core_reg2sec (abfd) == NULL)
+    {
+      bfd_release (abfd, core_regsec (abfd));
+      goto loser2;
+    }
 
   core_stacksec (abfd)->name = ".stack";
   core_datasec (abfd)->name = ".data";
@@ -573,15 +593,15 @@ DEFUN(sunos4_core_file_p,(abfd),
   core_reg2sec (abfd)->_raw_size = core->fp_stuff_size;
 
   core_stacksec (abfd)->vma = (core->c_stacktop - core->c_ssize);
-  core_datasec (abfd)->vma = N_DATADDR(core->c_aouthdr);
+  core_datasec (abfd)->vma = N_DATADDR (core->c_aouthdr);
   core_regsec (abfd)->vma = 0;
   core_reg2sec (abfd)->vma = 0;
 
   core_stacksec (abfd)->filepos = core->c_len + core->c_dsize;
   core_datasec (abfd)->filepos = core->c_len;
   /* We'll access the regs afresh in the core file, like any section: */
-  core_regsec (abfd)->filepos = (file_ptr)core->c_regs_pos;
-  core_reg2sec (abfd)->filepos = (file_ptr)core->fp_stuff_pos;
+  core_regsec (abfd)->filepos = (file_ptr) core->c_regs_pos;
+  core_reg2sec (abfd)->filepos = (file_ptr) core->fp_stuff_pos;
 
   /* Align to word at least */
   core_stacksec (abfd)->alignment_power = 2;
@@ -599,52 +619,54 @@ DEFUN(sunos4_core_file_p,(abfd),
   return abfd->xvec;
 }
 
-static char *sunos4_core_file_failing_command (abfd)
-bfd *abfd;
-  {
+static char *
+sunos4_core_file_failing_command (abfd)
+     bfd *abfd;
+{
   return core_hdr (abfd)->hdr->c_cmdname;
 }
 
 static int
-DEFUN(sunos4_core_file_failing_signal,(abfd),
-      bfd *abfd)
+sunos4_core_file_failing_signal (abfd)
+     bfd *abfd;
 {
   return core_hdr (abfd)->hdr->c_signo;
 }
 
 static boolean
-DEFUN(sunos4_core_file_matches_executable_p, (core_bfd, exec_bfd),
-      bfd *core_bfd AND
-      bfd *exec_bfd)
+sunos4_core_file_matches_executable_p (core_bfd, exec_bfd)
+     bfd *core_bfd;
+     bfd *exec_bfd;
 {
-  if (core_bfd->xvec != exec_bfd->xvec) {
-    bfd_error = system_call_error;
-    return false;
-  }
+  if (core_bfd->xvec != exec_bfd->xvec)
+    {
+      bfd_set_error (bfd_error_system_call);
+      return false;
+    }
 
-  return (memcmp ((char *)&((core_hdr (core_bfd)->hdr)->c_aouthdr), 
+  return (memcmp ((char *) &((core_hdr (core_bfd)->hdr)->c_aouthdr),
 		  (char *) exec_hdr (exec_bfd),
 		  sizeof (struct internal_exec)) == 0) ? true : false;
 }
 
 #define MY_set_sizes sunos4_set_sizes
 static boolean
-DEFUN (sunos4_set_sizes, (abfd),
-       bfd *abfd)
+sunos4_set_sizes (abfd)
+     bfd *abfd;
 {
   switch (bfd_get_arch (abfd))
     {
     default:
       return false;
     case bfd_arch_sparc:
-      adata(abfd).page_size = 0x2000;
-      adata(abfd).segment_size = 0x2000;
-      adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+      adata (abfd).page_size = 0x2000;
+      adata (abfd).segment_size = 0x2000;
+      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
       return true;
     case bfd_arch_m68k:
-      adata(abfd).page_size = 0x2000;
-      adata(abfd).segment_size = 0x20000;
-      adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
+      adata (abfd).page_size = 0x2000;
+      adata (abfd).segment_size = 0x20000;
+      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
       return true;
     }
 }
@@ -656,7 +678,8 @@ DEFUN (sunos4_set_sizes, (abfd),
 #define MY_read_dynamic_relocs 0
 #endif
 
-static CONST struct aout_backend_data sunos4_aout_backend = {
+static CONST struct aout_backend_data sunos4_aout_backend =
+{
   0,				/* zmagic files are not contiguous */
   1,				/* text includes header */
   0,				/* default text vma */