aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2000-10-31 22:56:17 +0000
committerPhil Blundell <philb@gnu.org>2000-10-31 22:56:17 +0000
commitcaaa2fec477a2b65ae1bce61af5b916e4a03e131 (patch)
tree391375ea70498f8ee78e977eb6a3f30220e675ce
parentdc6b543c48bf95bddd210cb9715e9f2bb052c5b5 (diff)
downloadbinutils-caaa2fec477a2b65ae1bce61af5b916e4a03e131.zip
binutils-caaa2fec477a2b65ae1bce61af5b916e4a03e131.tar.gz
binutils-caaa2fec477a2b65ae1bce61af5b916e4a03e131.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. From 2000-05-23 H.J. Lu <hjl@gnu.org> * elf32-ppc.c (ppc_elf_relocate_section): Fix a typo.
-rw-r--r--bfd/ChangeLog8
-rw-r--r--bfd/elf32-arm.h2
-rw-r--r--bfd/elf32-ppc.c2
3 files changed, 11 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ac4808a..9230b0d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
+ From 2000-05-23 H.J. Lu <hjl@gnu.org>
+ * elf32-ppc.c (ppc_elf_relocate_section): Fix a typo.
+
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 3ed64fe..72bbe78 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 9eec59b..b405fea 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;
}