aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorDaniel Gutson <dgutson@codesourcery.com>2009-12-28 18:37:30 +0000
committerDaniel Gutson <dgutson@codesourcery.com>2009-12-28 18:37:30 +0000
commitd8879994f79b8a2bc7cf55cfa962d0e3ae8bdf6d (patch)
tree919db9ea4833880d60fe92c7333655a403c6bd4d /bfd
parent99f1a7a78a814f5df32488c36be264a8e30bf3b1 (diff)
downloadgdb-d8879994f79b8a2bc7cf55cfa962d0e3ae8bdf6d.zip
gdb-d8879994f79b8a2bc7cf55cfa962d0e3ae8bdf6d.tar.gz
gdb-d8879994f79b8a2bc7cf55cfa962d0e3ae8bdf6d.tar.bz2
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/ChangeLog5
-rw-r--r--bfd/elf-attrs.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ce1ca39..6ccebdc 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 c34297c..c514ead 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;
}