diff options
| author | Nick Clifton <nickc@redhat.com> | 2011-10-24 12:52:37 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2011-10-24 12:52:37 +0000 |
| commit | ce8359cc4d2ac1e0f2ba4cc7f900b1334d40b976 (patch) | |
| tree | b208ff7c25a3dbfdd6732ac98f9463090f4c2d3b | |
| parent | dab0df1afc551eb5eac97b5cc6cdc935eb8de6e0 (diff) | |
| download | binutils-redhat-ce8359cc4d2ac1e0f2ba4cc7f900b1334d40b976.tar.gz | |
PR ld/13273
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Do not warn about
identical TAG_PCS_config attributes.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-arm.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f22f108684..49b97c6eb1 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 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. */ |