merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ad6cd02ef202c55e7649d12cd3f2cf8048c1c355..fffd19a28c4ba785c42ee48b4315d2f80b47361c 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -4,6 +4,10 @@
        * Makefile.in: Rebuild deps.
        (maintainer-clean-subdir): Depend on stamp-h rather than config.h.
 
+2007-07-02  Simon Baldwin <simonb@google.com>
+
+       * argv.c (writeargv): Removed declaration of unused variable.
+
 2007-06-14  Paolo Bonzini  <bonzini@gnu.org>
 
        * configure.ac: Use ACX_PROG_CC_ALMOST_PEDANTIC too.

diff --git a/libiberty/argv.c b/libiberty/argv.c
index a04f50d7f4910a02666a81d71317a6f4692dfca3..faeb72de4487e445cbe8a8b979a0be82fbcb91ca 100644 (file)
--- a/libiberty/argv.c
+++ b/libiberty/argv.c
@@ -310,7 +310,6 @@ writeargv (char **argv, FILE *f)
 
   while (*argv != NULL)
     {
-      int ret;
       const char *arg = *argv;
 
       while (*arg != EOS)