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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 71697de6b1621daabf01a3e52891d4fb49e101cd..699244fdcde44a72848a86169d71eced5c34cdc4 100644 (file)
--- 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 7d244856e8c99d4748f2044e89f3fb467c4701a8..64c11251865eb1840ceb19a5f857227e06f7b543 100644 (file)
--- 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))