diff options
author | Daniel Gutson <dgutson@codesourcery.com> | 2009-12-28 18:37:30 +0000 |
---|---|---|
committer | Daniel Gutson <dgutson@codesourcery.com> | 2009-12-28 18:37:30 +0000 |
commit | 7ae577a70274c554945a1ba44c6c5908fa3d7f66 (patch) | |
tree | a3d43eb02727d4a17a9c636d3f9058a9d7db5bb2 /bfd | |
parent | cbe86d7aecae67f1e926804fd2a138737ef13a87 (diff) | |
download | binutils-redhat-7ae577a70274c554945a1ba44c6c5908fa3d7f66.tar.gz |
2009-12-28 Daniel Gutson <dgutson@codesourcery.com>
* elf-attrs.c (_bfd_elf_merge_object_attributes): Error
message rephrased.
Diffstat (limited to 'bfd')
-rw-r--r-- | bfd/ChangeLog | 5 | ||||
-rw-r--r-- | bfd/elf-attrs.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index ce1ca39a02..6ccebdcbc0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2009-12-28 Daniel Gutson <dgutson@codesourcery.com> + + * elf-attrs.c (_bfd_elf_merge_object_attributes): Error + message rephrased. + 2009-12-21 Alan Modra <amodra@gmail.com> * elf64-ppc.c: Delete my email address. diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c index c34297ccda..c514ead2eb 100644 --- a/bfd/elf-attrs.c +++ b/bfd/elf-attrs.c @@ -564,7 +564,8 @@ _bfd_elf_merge_object_attributes (bfd *ibfd, bfd *obfd) if (in_attr->i > 0 && strcmp (in_attr->s, "gnu") != 0) { _bfd_error_handler - (_("error: %B: Must be processed by '%s' toolchain"), + (_("error: %B: Object has vendor-specific contents that " + "must be processed by the '%s' toolchain"), ibfd, in_attr->s); return FALSE; } |