summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/cpu-s390.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 055f52a573..232b9e1122 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-27 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
+
+ * cpu-s390.c (bfd_s390_64_arch, bfd_s390_arch): Pick the default
+ arch depending on the target size.
+
2012-07-27 Tristan Gingold <gingold@adacore.com>
* configure.in: Bump version to 2.23.51
diff --git a/bfd/cpu-s390.c b/bfd/cpu-s390.c
index 1a581e4720..1cd3af1a7e 100644
--- a/bfd/cpu-s390.c
+++ b/bfd/cpu-s390.c
@@ -33,7 +33,11 @@ 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,
@@ -50,7 +54,11 @@ 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,