From b6009aca9a683ad95502bf895d62a02fa5d72724 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 24 Oct 2011 12:52:37 +0000 Subject: [PATCH] PR ld/13273 * elf32-arm.c (elf32_arm_merge_eabi_attributes): Do not warn about identical TAG_PCS_config attributes. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-arm.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + 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 * 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. */ -- 2.30.2