diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index dcd24502afa0467fe87e56cd9d8a3be7bdac8b51..5aa21740578346fe5e5e5f88e280a29b35ad451f 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-27  Mark Mitchell  <mark@codesourcery.com>
+
+	* argv.c (expandargv): Do not use xmalloc_failed.
+
 2005-09-26  Mark Mitchell  <mark@codesourcery.com>
 
 	* argv.c (safe-ctype.h): Include it.
diff --git a/libiberty/argv.c b/libiberty/argv.c
index 71f164acf7ded1cf482a936f89a96749b294b738..79241b6dce7867763af5af3e2b75d31c8eac55f9 100644
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -365,9 +365,10 @@ expandargv (argcp, argvp)
 	{
 	  *argvp = dupargv (*argvp);
 	  if (!*argvp)
-	    /* We do not know exactly many bytes dupargv tried to
-	       allocate, so make a guess.  */
-	    xmalloc_failed (*argcp * 32);
+	    {
+	      fputs ("\nout of memory\n", stderr);
+	      xexit (1);
+	    }
 	}
       /* Count the number of arguments.  */
       file_argc = 0;