From: Nick Clifton <nickc@redhat.com>
Date: Mon, 24 Oct 2011 12:52:37 +0000 (+0000)
Subject: 	PR ld/13273
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6009aca9a683ad95502bf895d62a02fa5d72724;p=binutils-gdb.git

	PR ld/13273
	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Do not warn about
	identical TAG_PCS_config attributes.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f22f1086847..49b97c6eb1f 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-24  Eugeniy Meshcheryakov  <eugen@debian.org>
+
+	PR ld/13273
+	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Do not warn about
+	identical TAG_PCS_config attributes.
+
 2011-10-24  Nick Clifton  <nickc@redhat.com>
 
 	* po/ja.po: Updated Japanese translation.
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index e663d931c87..314c6f9de9b 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -11549,7 +11549,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
 	case Tag_PCS_config:
 	  if (out_attr[i].i == 0)
 	    out_attr[i].i = in_attr[i].i;
-	  else if (in_attr[i].i != 0 && out_attr[i].i != 0)
+	  else if (in_attr[i].i != 0 && out_attr[i].i != in_attr[i].i)
 	    {
 	      /* It's sometimes ok to mix different configs, so this is only
 	         a warning.  */