Merge GDB 7.5.1

bfd/sparclynx.c

 /* BFD support for Sparc binaries under LynxOS.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000,
-   2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+   2001, 2002, 2003, 2005, 2007, 2012 Free Software Foundation, Inc.
 
    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 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
@@ skipping 16 matching lines @@
 #include "bfd.h"
 #include "libbfd.h"
 
 #include "aout/sun4.h"
 #include "libaout.h"            /* BFD a.out internal data structures */
 
 #include "aout/aout64.h"
 #include "aout/stab_gnu.h"
 #include "aout/ar.h"
 
-void NAME (lynx,set_arch_mach) PARAMS ((bfd *, unsigned long));
-static void choose_reloc_size PARAMS ((bfd *));
-static bfd_boolean NAME (aout,sparclynx_write_object_contents) PARAMS ((bfd *));
+void NAME (lynx,set_arch_mach) (bfd *, unsigned long);
+static void choose_reloc_size (bfd *);
+static bfd_boolean NAME (aout,sparclynx_write_object_contents) (bfd *);
 
 /* This is needed to reject a NewsOS file, e.g. in
    gdb/testsuite/gdb.t10/crossload.exp. <kingdon@cygnus.com>
    I needed to add M_UNKNOWN to recognize a 68000 object, so this will
    probably no longer reject a NewsOS object.  <ian@cygnus.com>.  */
-#define MACHTYPE_OK(mtype) ((mtype) == M_UNKNOWN \
+#define MACHTYPE_OK(mtype) (   (mtype) == M_UNKNOWN \
                             || (mtype) == M_68010 \
                             || (mtype) == M_68020 \
                             || (mtype) == M_SPARC)
 
 /* The file @code{aoutf1.h} contains the code for BFD's
    a.out back end. Control over the generated back end is given by these
    two preprocessor names:
    @table @code
    @item ARCH_SIZE
    This value should be either 32 or 64, depending upon the size of an
    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{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.
 
    @item TARGETNAME
    The name put into the target vector.
    @item
    @end table  */
 
 void
-NAME(lynx,set_arch_mach) (abfd, machtype)
-     bfd *abfd;
-     unsigned long machtype;
+NAME(lynx,set_arch_mach) (bfd *abfd, unsigned long machtype)
 {
   /* Determine the architecture and machine type of the object file.  */
   enum bfd_architecture arch;
   unsigned long machine;
 
   switch (machtype)
     {
     case M_UNKNOWN:
       /* Some Sun3s make magic numbers without cpu types in them, so
          we'll default to the 68000.  */
@@ skipping 37 matching lines @@
   bfd_set_arch_mach (abfd, arch, machine);
 }
 
 #define SET_ARCH_MACH(ABFD, EXEC) \
   NAME(lynx,set_arch_mach) (ABFD, N_MACHTYPE (EXEC)); \
   choose_reloc_size(ABFD);
 
 /* Determine the size of a relocation entry, based on the architecture.  */
 
 static void
-choose_reloc_size (abfd)
-     bfd *abfd;
+choose_reloc_size (bfd *abfd)
 {
   switch (bfd_get_arch (abfd))
     {
     case bfd_arch_sparc:
       obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
       break;
     default:
       obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
       break;
     }
 }
 
 /* Write an object file in LynxOS format.
   Section contents have already been written.  We write the
   file header, symbols, and relocation.  */
 
 static bfd_boolean
-NAME(aout,sparclynx_write_object_contents) (abfd)
-     bfd *abfd;
+NAME(aout,sparclynx_write_object_contents) (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))
         {
@@ skipping 19 matching lines @@
   choose_reloc_size (abfd);
 
   N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
 
   WRITE_HEADERS (abfd, execp);
 
   return TRUE;
 }
 
 #define MY_set_sizes sparclynx_set_sizes
-static bfd_boolean sparclynx_set_sizes PARAMS ((bfd *));
+static bfd_boolean sparclynx_set_sizes (bfd *);
 
 static bfd_boolean
-sparclynx_set_sizes (abfd)
-     bfd *abfd;
+sparclynx_set_sizes (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;
       return TRUE;
@@ skipping 10 matching lines @@
     0, 1, 0, 1, 0, sparclynx_set_sizes, 0,
     0,                          /* add_dynamic_symbols */
     0,                          /* add_one_symbol */
     0,                          /* link_dynamic_object */
     0,                          /* write_dynamic_symbol */
     0,                          /* check_dynamic_reloc */
     0                           /* finish_dynamic_link */
   };