summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2008-06-09 15:19:52 +0000
committerPaul Brook <paul@codesourcery.com>2008-06-09 15:19:52 +0000
commitc13bb2ea031cc1528245254fd6a94f398df2e7d1 (patch)
tree824e620caa1e444c9e20c43df49994b3ab4f0b56
parent3526781ecfbda987bc13c7b4cc76498a324b5ec6 (diff)
downloadbinutils-gdb-c13bb2ea031cc1528245254fd6a94f398df2e7d1.tar.gz
2008-06-09 Paul Brook <paul@codesourcery.com>
bfd/ * elf32-arm.c (elf32_arm_merge_private_bfd_data): Allow BE8 shared libraries.
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf32-arm.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b886cbf8e4e..3167126c3b9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-09 Paul Brook <paul@codesourcery.com>
+
+ bfd/
+ * elf32-arm.c (elf32_arm_merge_private_bfd_data): Allow BE8 shared
+ libraries.
+
2008-06-09 Christophe Lyon <christophe.lyon@st.com>
* elf32-arm.c (arm_stub_is_thumb): Define.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index 1101369917e..e691300efd3 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -8406,6 +8406,7 @@ elf32_arm_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
in practice it isn't even close to working and there is no real
reason to want it. */
if (EF_ARM_EABI_VERSION (in_flags) >= EF_ARM_EABI_VER4
+ && !(ibfd->flags & DYNAMIC)
&& (in_flags & EF_ARM_BE8))
{
_bfd_error_handler (_("ERROR: %B is already in final BE8 format"),