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 f22f1086847c8ccda1eb4b3a0c4c33ffc4416356..49b97c6eb1f156074b87ac6c92f2e38647161b44 100644 (file)
--- 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 e663d931c87412371aa3f18c978f21b7e9f95275..314c6f9de9bed9cb6dc0afbec72a5eafbbc8aa46 100644 (file)
--- 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.  */