merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index e46c711..04250b7 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-03  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * xmalloc.c (xmalloc_fail): Clarify error message.
+
 2002-02-21  Jim Blandy  <jimb@redhat.com>
 
        * splay-tree.c (splay_tree_xmalloc_allocate,

diff --git a/libiberty/xmalloc.c b/libiberty/xmalloc.c
index bf0cf2d..433fd5c 100644 (file)
--- a/libiberty/xmalloc.c
+++ b/libiberty/xmalloc.c
@@ -120,12 +120,12 @@ xmalloc_failed (size)
   else
     allocated = (char *) sbrk (0) - (char *) &environ;
   fprintf (stderr,
-          "\n%s%sCannot allocate %lu bytes after allocating %lu bytes\n",
+          "\n%s%sout of memory allocating %lu bytes after allocating %lu bytes\n",
           name, *name ? ": " : "",
           (unsigned long) size, (unsigned long) allocated);
 #else /* HAVE_SBRK */
   fprintf (stderr,
-          "\n%s%sCannot allocate %lu bytes\n",
+          "\n%s%sout of memory allocating %lu bytes\n",
           name, *name ? ": " : "",
           (unsigned long) size);
 #endif /* HAVE_SBRK */