Automatic date update in version.in

[platform/upstream/binutils.git] / bfd / cpu-s390.c

diff --git a/bfd/cpu-s390.c b/bfd/cpu-s390.c
index 15eb9a5..badf39d 100644 (file)
--- a/bfd/cpu-s390.c
+++ b/bfd/cpu-s390.c
@@ -1,12 +1,12 @@
 /* BFD support for the s390 processor.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2014 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
-   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,
@@ -16,26 +16,31 @@
 
    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 "bfd.h"
 #include "libbfd.h"
 
-const bfd_arch_info_type bfd_s390_esame_arch =
+const bfd_arch_info_type bfd_s390_64_arch =
 {
     64,        /* bits in a word */
     64,        /* bits in an address */
     8, /* bits in a byte */
     bfd_arch_s390,
-    bfd_mach_s390_esame,
+    bfd_mach_s390_64,
     "s390",
-    "s390:esame",
+    "s390:64-bit",
     3, /* section alignment power */
-    true, /* the default */
+#if BFD_DEFAULT_TARGET_SIZE == 64
+    TRUE, /* the default */
+#else
+    FALSE, /* the default */
+#endif
     bfd_default_compatible,
     bfd_default_scan,
+    bfd_arch_default_fill,
     NULL
 };
 
@@ -45,12 +50,17 @@ const bfd_arch_info_type bfd_s390_arch =
     32,        /* bits in an address */
     8, /* bits in a byte */
     bfd_arch_s390,
-    bfd_mach_s390_esa,
+    bfd_mach_s390_31,
     "s390",
-    "s390:390",
+    "s390:31-bit",
     3, /* section alignment power */
-    true, /* the default */
+#if BFD_DEFAULT_TARGET_SIZE == 64
+    FALSE, /* the default */
+#else
+    TRUE, /* the default */
+#endif
     bfd_default_compatible,
     bfd_default_scan,
-    &bfd_s390_esame_arch
+    bfd_arch_default_fill,
+    &bfd_s390_64_arch
 };