Fix spelling mistakes in comments in configure scripts

[deliverable/binutils-gdb.git] / bfd / cpu-s390.c

diff --git a/bfd/cpu-s390.c b/bfd/cpu-s390.c
index 15eb9a5831e70fc29b39ca889ea80d1c707cf41a..cb03cafc4d4b47c2821cd463f55c4d5362d7a150 100644 (file)
--- a/bfd/cpu-s390.c
+++ b/bfd/cpu-s390.c
@@ -1,12 +1,12 @@
 /* BFD support for the s390 processor.
 /* BFD support for the s390 processor.

-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.

    Contributed by Carl B. Pedersen and Martin Schwidefsky.
 
    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
    Contributed by Carl B. Pedersen and Martin Schwidefsky.
 
    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
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,41 +16,38 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 
 #include "libbfd.h"
 

-const bfd_arch_info_type bfd_s390_esame_arch =
-{
-    64,        /* bits in a word */
-    64,        /* bits in an address */
-    8, /* bits in a byte */
-    bfd_arch_s390,
-    bfd_mach_s390_esame,
-    "s390",
-    "s390:esame",
-    3, /* section alignment power */
-    true, /* the default */
-    bfd_default_compatible,
-    bfd_default_scan,
-    NULL
-};
+#define N(bits, number, print, is_default, next)       \
+  {                                                    \
+    bits,             /* bits in a word */             \
+    bits,             /* bits in an address */         \
+    8,                /* bits in a byte */             \
+    bfd_arch_s390,                                     \
+    number,                                            \
+    "s390",                                            \
+    print,                                             \
+    3,                /* section alignment power */    \
+    is_default,                                                \
+    bfd_default_compatible,                            \
+    bfd_default_scan,                                  \
+    bfd_arch_default_fill,                             \
+    next                                               \
+  }

 
 

+#if BFD_DEFAULT_TARGET_SIZE == 64
+static const bfd_arch_info_type bfd_s390_31_arch =
+  N (32, bfd_mach_s390_31, "s390:31-bit", FALSE, NULL);
+const bfd_arch_info_type bfd_s390_arch =
+  N (64, bfd_mach_s390_64, "s390:64-bit", TRUE, &bfd_s390_31_arch);
+#else
+static const bfd_arch_info_type bfd_s390_64_arch =
+  N (64, bfd_mach_s390_64, "s390:64-bit", FALSE, NULL);

 const bfd_arch_info_type bfd_s390_arch =
 const bfd_arch_info_type bfd_s390_arch =

-{
-    32,        /* bits in a word */
-    32,        /* bits in an address */
-    8, /* bits in a byte */
-    bfd_arch_s390,
-    bfd_mach_s390_esa,
-    "s390",
-    "s390:390",
-    3, /* section alignment power */
-    true, /* the default */
-    bfd_default_compatible,
-    bfd_default_scan,
-    &bfd_s390_esame_arch
-};
+  N (32, bfd_mach_s390_31, "s390:31-bit", TRUE, &bfd_s390_64_arch);
+#endif