Merge GDB 7.5.1

bfd/cpu-i960.c

 /* BFD library support routines for the i960 architecture.
    Copyright 1990, 1991, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2005, 2006,
-   2007 Free Software Foundation, Inc.
+   2007, 2012 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
    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
    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.  */
 
 #include "sysdep.h"
 #include "bfd.h"
 #include "libbfd.h"
 
-static bfd_boolean scan_960_mach
-  PARAMS ((const bfd_arch_info_type *, const char *));
-static const bfd_arch_info_type *compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-
 /* This routine is provided a string, and tries to work out if it
    could possibly refer to the i960 machine pointed at in the
    info_struct pointer */
 
 static bfd_boolean
-scan_960_mach (ap, string)
-     const bfd_arch_info_type *ap;
-     const char *string;
+scan_960_mach (const bfd_arch_info_type *ap,
+               const char *string)
 {
   unsigned long machine;
   int fail_because_not_80960 = FALSE;
 
   /* Look for the string i960 at the front of the string.  */
   if (strncasecmp ("i960", string, 4) == 0)
     {
       string += 4;
 
       /* i960 on it's own means core to us.  */
@@ skipping 60 matching lines @@
     return TRUE;
 
   return FALSE;
 }
 
 /* This routine is provided two arch_infos and works out the i960
    machine which would be compatible with both and returns a pointer
    to its info structure */
 
 static const bfd_arch_info_type *
-compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
+compatible (const bfd_arch_info_type *a,
+            const bfd_arch_info_type *b)
 {
 
   /* The i960 has distinct subspecies which may not interbreed:
         CORE CA
         CORE KA KB MC XA
         CORE HX JX
      Any architecture on the same line is compatible, the one on
      the right is the least restrictive.
 
      We represent this information in an array, each machine to a side */
@@ skipping 16 matching lines @@
       { KA,     KA,     KA,     KB,     MC,     XA,     ERROR,  ERROR,  ERROR},
       { KB,     KB,     KB,     KB,     MC,     XA,     ERROR,  ERROR,  ERROR},
       { MC,     MC,     MC,     MC,     MC,     XA,     ERROR,  ERROR,  ERROR},
       { XA,     XA,     XA,     XA,     XA,     XA,     ERROR,  ERROR,  ERROR},
       { CA,     CA,     ERROR,  ERROR,  ERROR,  ERROR,  CA,     ERROR,  ERROR},
       { JX,     JX,     ERROR,  ERROR,  ERROR,  ERROR,  ERROR,  JX,     HX },
       { HX,     HX,     ERROR,  ERROR,  ERROR,  ERROR,  ERROR,  HX,     HX },
     };
 
   if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR)
-    {
     return NULL;
-    }
-  else
-    {
-    return (a->mach  ==  matrix[a->mach][b->mach]) ?  a : b;
-    }
+
+  return (a->mach  ==  matrix[a->mach][b->mach]) ?  a : b;
 }
 
 #define N(a,b,d,n) \
-{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,n,}
+{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach, \
+  bfd_arch_default_fill, n,}
 
 static const bfd_arch_info_type arch_info_struct[] =
 {
   N(bfd_mach_i960_ka_sa,"i960:ka_sa",FALSE, &arch_info_struct[1]),
   N(bfd_mach_i960_kb_sb,"i960:kb_sb",FALSE, &arch_info_struct[2]),
   N(bfd_mach_i960_mc,   "i960:mc",   FALSE, &arch_info_struct[3]),
   N(bfd_mach_i960_xa,   "i960:xa",   FALSE, &arch_info_struct[4]),
   N(bfd_mach_i960_ca,   "i960:ca",   FALSE, &arch_info_struct[5]),
   N(bfd_mach_i960_jx,   "i960:jx",   FALSE, &arch_info_struct[6]),
   N(bfd_mach_i960_hx,   "i960:hx",   FALSE, 0),
 };
 
 const bfd_arch_info_type bfd_i960_arch =
   N(bfd_mach_i960_core, "i960:core", TRUE, &arch_info_struct[0]);