aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2000-11-01 07:20:04 +0000
committerPhil Blundell <philb@gnu.org>2000-11-01 07:20:04 +0000
commitee43f35ef7063359a8f0cdb4b793b8a3b9862230 (patch)
treecba11c50971eb5d507a4a262cfc594fe8e36f178
parentc51ce5f0646879e7a1070673df888435204dcb1a (diff)
downloadgdb-ee43f35ef7063359a8f0cdb4b793b8a3b9862230.zip
gdb-ee43f35ef7063359a8f0cdb4b793b8a3b9862230.tar.gz
gdb-ee43f35ef7063359a8f0cdb4b793b8a3b9862230.tar.bz2
2000-10-31 Philip Blundell <philb@gnu.org>
* elf32-arm.h (elf32_arm_merge_private_bfd_data): Only handle EF_SOFT_FLOAT if it is defined.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 71697de..699244f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-31 Philip Blundell <philb@gnu.org>
+
+ * elf32-arm.h (elf32_arm_merge_private_bfd_data): Only handle
+ EF_SOFT_FLOAT if it is defined.
+
2000-10-27 Philip Blundell <philb@gnu.org>
* elf32-arm.h (elf32_arm_copy_private_bfd_data): Don't refuse
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 7d24485..64c1125 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -2123,6 +2123,7 @@ Error: %s passes floats in %s registers, whereas %s passes them in %s registers"
flags_compatible = false;
}
+#ifdef EF_SOFT_FLOAT
if ((in_flags & EF_SOFT_FLOAT) != (out_flags & EF_SOFT_FLOAT))
{
_bfd_error_handler (_ ("\
@@ -2133,6 +2134,7 @@ Error: %s uses %s floating point, whereas %s uses %s floating point"),
out_flags & EF_SOFT_FLOAT ? _("soft") : _("hard"));
flags_compatible = false;
}
+#endif
/* Interworking mismatch is only a warning. */
if ((in_flags & EF_INTERWORK) != (out_flags & EF_INTERWORK))