aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2013-02-07 03:44:26 +0000
committerAlan Modra <amodra@gmail.com>2013-02-07 03:44:26 +0000
commitdafbc74d2c30322553791e940a3e7110be39ed10 (patch)
treecec4ac673ac389d8f3d43036be4a1479ae798829
parent20e52bd2b8041df10920960f5882636d420ebb13 (diff)
downloadfsf-binutils-gdb-dafbc74d2c30322553791e940a3e7110be39ed10.zip
fsf-binutils-gdb-dafbc74d2c30322553791e940a3e7110be39ed10.tar.gz
fsf-binutils-gdb-dafbc74d2c30322553791e940a3e7110be39ed10.tar.bz2
PR binutils/14873
* elf-attrs.c (_bfd_elf_copy_obj_attributes): Don't attempt to copy attributes from or to non-ELF.
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elf-attrs.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 50ed06f..c13b5bc 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-07 Alan Modra <amodra@gmail.com>
+
+ PR binutils/14873
+ * elf-attrs.c (_bfd_elf_copy_obj_attributes): Don't attempt to
+ copy attributes from or to non-ELF.
+
2013-02-06 H.J. Lu <hongjiu.lu@intel.com>
* elf32-i386.c (elf_i386_allocate_dynrelocs): Don't clear pc_count
diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index 4237af5..9a6ff6f 100644
--- a/bfd/elf-attrs.c
+++ b/bfd/elf-attrs.c
@@ -347,6 +347,10 @@ _bfd_elf_copy_obj_attributes (bfd *ibfd, bfd *obfd)
int i;
int vendor;
+ if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+ || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+ return;
+
for (vendor = OBJ_ATTR_FIRST; vendor <= OBJ_ATTR_LAST; vendor++)
{
in_attr