From: Nick Clifton <nickc@redhat.com>
Date: Fri, 20 Apr 2012 15:12:06 +0000 (+0000)
Subject: 	Import this patch from the mainline:
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37b05a07ce8a46c48d2060f4b0cdc5763addcf08;p=thirdparty%2Fbinutils-gdb.git

	Import this patch from the mainline:
	2012-03-21  Eliot Dresselhaus  <eliot@sonic.net>

	* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
	for non-C6X objects.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 87498f0a546..4ec85245eec 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,14 @@
+2012-04-20  Nick Clifton  <nickc@redhat.com>
+
+	Import this patch from the mainline:
+	2012-03-21  Eliot Dresselhaus  <eliot@sonic.net>
+
+	* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
+	for non-C6X objects.
+
 2012-02-01  Nick Clifton  <nickc@redhat.com>
 
-	* Import this patch from the mainline:
+	Import this patch from the mainline:
 	2012-01-05  Nick Clifton  <nickc@redhat.com>
 
 	PR ld/12161
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 19287fec182..44042eb1ae3 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -4018,6 +4018,9 @@ elf32_tic6x_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
   if (!_bfd_generic_verify_endian_match (ibfd, obfd))
     return FALSE;
 
+  if (! is_tic6x_elf (ibfd) || ! is_tic6x_elf (obfd))
+    return TRUE;
+
   if (!elf32_tic6x_merge_attributes (ibfd, obfd))
     return FALSE;