From eac170e4eaf0bb1c23625120e5d0c4118b26fe43 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 31 Oct 2000 22:56:17 +0000 Subject: 2000-10-31 Philip Blundell * elf32-arm.h (elf32_arm_merge_private_bfd_data): Only handle EF_SOFT_FLOAT if it is defined. From 2000-05-23 H.J. Lu * elf32-ppc.c (ppc_elf_relocate_section): Fix a typo. --- bfd/ChangeLog | 8 ++++++++ bfd/elf32-arm.h | 2 ++ bfd/elf32-ppc.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ac4808a4f69..9230b0d04a3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2000-10-31 Philip Blundell + + * elf32-arm.h (elf32_arm_merge_private_bfd_data): Only handle + EF_SOFT_FLOAT if it is defined. + + From 2000-05-23 H.J. Lu + * elf32-ppc.c (ppc_elf_relocate_section): Fix a typo. + 2000-10-27 Philip Blundell * 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 3ed64fe312d..72bbe780bf0 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -2057,6 +2057,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 (_ ("\ @@ -2067,6 +2068,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)) diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 9eec59bde5c..b405feaa1f5 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -3121,7 +3121,7 @@ ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section, rel->r_offset, (!info->shared || info->no_undefined - ELF_ST_VISIBILITY (h->other)))) + || ELF_ST_VISIBILITY (h->other)))) return false; relocation = 0; } -- cgit v1.2.1