X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bfd%2Fcpu-i370.c;h=bb5bc2fd0755711dd9c0fb6739c8551164077645;hb=48bef97a1a4045d63d1b2dea4cdfca335ddfc1f8;hp=c6c599a1b7b230fe4180f9ad25f152f02f6d1659;hpb=7898dedac0f0bd75d7363d13427c4a1e72b66f66;p=platform%2Fupstream%2Fbinutils.git

diff --git a/bfd/cpu-i370.c b/bfd/cpu-i370.c
index c6c599a..bb5bc2f 100644
--- a/bfd/cpu-i370.c
+++ b/bfd/cpu-i370.c
@@ -1,95 +1,77 @@
 /* BFD i370 CPU definition
-   Copyright 1994, 1995, 1996, 1998, 1999, 2000
-   Free Software Foundation, Inc.
+   Copyright (C) 1994-2014 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor, Cygnus Support.
    Hacked by Linas Vepstas <linas@linas.org> in 1998, 1999
 
-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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 
-/* The common i360/370 architecture comes in many forms  */
-
-static const bfd_arch_info_type *i370_compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-
-static const bfd_arch_info_type *
-i370_compatible (a, b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  BFD_ASSERT (a->arch == bfd_arch_i370);
-  switch (b->arch)
-    {
-    default:
-      return NULL;
-    case bfd_arch_i370:
-      return bfd_default_compatible (a, b);
-    }
-  /*NOTREACHED*/
-}
-
 static const bfd_arch_info_type arch_info_struct[] =
 {
-  /* hack alert: old old machines are really 16 and 24 bit arch ...  */
+  /* Hack alert: old old machines are really 16 and 24 bit arch ...  */
   {
-    32, /* 32 bits in a word */
-    32, /* 32 bits in an address */
-    8,  /* 8 bits in a byte */
+    32, 	/* 32 bits in a word.  */
+    32, 	/* 32 bits in an address.  */
+    8,  	/* 8 bits in a byte.  */
     bfd_arch_i370,
-    360, /* for the 360 */
+    360, 	/* For the 360.  */
     "i370",
     "i370:360",
     3,
-    false, /* not the default */
-    i370_compatible,
+    FALSE, 	/* Not the default.  */
+    bfd_default_compatible,
     bfd_default_scan,
+    bfd_arch_default_fill,
     &arch_info_struct[1]
   },
   {
-    32, /* 32 bits in a word */
-    32, /* 32 bits in an address */
-    8,  /* 8 bits in a byte */
+    32, 	/* 32 bits in a word.  */
+    32, 	/* 32 bits in an address.  */
+    8,  	/* 8 bits in a byte.  */
     bfd_arch_i370,
-    370, /* for the 370 */
+    370, 	/* For the 370.  */
     "i370",
     "i370:370",
     3,
-    false, /* not the default */
-    i370_compatible,
+    FALSE, 	/* Not the default.  */
+    bfd_default_compatible,
     bfd_default_scan,
+    bfd_arch_default_fill,
     0
   },
 };
 
 const bfd_arch_info_type bfd_i370_arch =
-  {
-    32, /* 32 bits in a word */
-    32, /* 32 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_i370,
-    0,  /* for the 360/370 common architecture */
-    "i370",
-    "i370:common",
-    3,
-    true, /* the default */
-    i370_compatible,
-    bfd_default_scan,
-    &arch_info_struct[0]
-  };
+{
+  32, 		/* 32 bits in a word.  */
+  32, 		/* 32 bits in an address.  */
+  8,  		/* 8 bits in a byte.  */
+  bfd_arch_i370,
+  0,		/* For the 360/370 common architecture.  */
+  "i370",
+  "i370:common",
+  3,
+  TRUE, 	/* The default.  */
+  bfd_default_compatible,
+  bfd_default_scan,
+  bfd_arch_default_fill,
+  & arch_info_struct[0]
+};