From: Alan Modra <amodra@gmail.com>
Date: Thu, 7 Feb 2013 03:44:41 +0000 (+0000)
Subject: 	PR binutils/14873
X-Git-Tag: binutils-2_23_2~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06cbc9989f7b5242d5ead9d4014420913df13f83;p=thirdparty%2Fbinutils-gdb.git

	PR binutils/14873
	* elf-attrs.c (_bfd_elf_copy_obj_attributes): Don't attempt to
	copy attributes from or to non-ELF.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 17505e21868..1002477ad48 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-01  Alan Modra  <amodra@gmail.com>
 
 	* elf64-ppc.c (dec_dynrel_count): Don't error when elf_gc_sweep_symbol
diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index 4237af58eb7..9a6ff6f9109 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