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 ce1ca39a0246b68c2fc8a3d102de5a1c50a0ba01..6ccebdcbc0d600a621e5a7b7dcdd59c4196e0f4b 100644 (file)
--- 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 c34297ccdaabf8d8e4a8bd2d53931686bb2c5525..c514ead2ebb0681e8c2bd81cdae3c6a667f925ed 100644 (file)
--- 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;
        }