From ce8359cc4d2ac1e0f2ba4cc7f900b1334d40b976 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 24 Oct 2011 12:52:37 +0000 Subject: PR ld/13273 * elf32-arm.c (elf32_arm_merge_eabi_attributes): Do not warn about identical TAG_PCS_config attributes. --- bfd/elf32-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bfd/elf32-arm.c') diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index e663d931c8..314c6f9de9 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. */ -- cgit v1.2.1