2013-08-21 Tristan Gingold <gingold@adacore.com>

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

diff --git a/bfd/cpu-s390.c b/bfd/cpu-s390.c
index b385a9c6bdb1db535128cc11370aea89fca29a8d..1cd3af1a7e70f0a3610732e6febe39c54233a328 100644 (file)
--- a/bfd/cpu-s390.c
+++ b/bfd/cpu-s390.c
@@ -1,12 +1,12 @@
 /* BFD support for the s390 processor.
-   Copyright 2000, 2001, 2002, 2007 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2005, 2007 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,
@@ -33,9 +33,14 @@ const bfd_arch_info_type bfd_s390_64_arch =
     "s390",
     "s390:64-bit",
     3, /* section alignment power */
+#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
 };
 
@@ -49,8 +54,13 @@ const bfd_arch_info_type bfd_s390_arch =
     "s390",
     "s390:31-bit",
     3, /* section alignment power */
+#if BFD_DEFAULT_TARGET_SIZE == 64
+    FALSE, /* the default */
+#else
     TRUE, /* the default */
+#endif
     bfd_default_compatible,
     bfd_default_scan,
+    bfd_arch_default_fill,
     &bfd_s390_64_arch
 };