From: Daniel Gutson <dgutson@codesourcery.com>
Date: Mon, 28 Dec 2009 18:37:30 +0000 (+0000)
Subject: 2009-12-28  Daniel Gutson  <dgutson@codesourcery.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8879994f79b8a2bc7cf55cfa962d0e3ae8bdf6d;p=binutils-gdb.git

2009-12-28  Daniel Gutson  <dgutson@codesourcery.com>

        * elf-attrs.c (_bfd_elf_merge_object_attributes): Error
        message rephrased.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ce1ca39a024..6ccebdcbc0d 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 c34297ccdaa..c514ead2ebb 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;
 	}