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 | b6009aca9a683ad95502bf895d62a02fa5d72724 (patch) | |
| tree | 55ddfb4aef0b3642a9197dede990f265e13f8c7f /bfd | |
| parent | 07725569e1dcd8d62deff455ba7d04dcbd2a6af3 (diff) | |
| download | binutils-b6009aca9a683ad95502bf895d62a02fa5d72724.zip binutils-b6009aca9a683ad95502bf895d62a02fa5d72724.tar.gz binutils-b6009aca9a683ad95502bf895d62a02fa5d72724.tar.bz2 | |
PR ld/13273
* elf32-arm.c (elf32_arm_merge_eabi_attributes): Do not warn about
identical TAG_PCS_config attributes.
Diffstat (limited to 'bfd')
| -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 f22f108..49b97c6 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 e663d93..314c6f9 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. */ |