merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 6e9bf117b5c63a9f19d2ef9f8756f2b86ce7f79b..169c821e5ac4d4a82de9f52e3c098d46e9070922 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-04  Ian Lance Taylor  <ian@airs.com>
+
+       * testsuite/test-pexecute.c (TEST_PEX_RUN): Move variable
+       declaration before statement.
+
 2005-04-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * bcmp.c: Fix warnings and implement using memcmp.

diff --git a/libiberty/testsuite/test-pexecute.c b/libiberty/testsuite/test-pexecute.c
index c67bcefb8f680ec889b5627f902a219fbb0bee23..dfb5413453edceebf0ffc5c86ae9b2eb17678783 100644 (file)
--- a/libiberty/testsuite/test-pexecute.c
+++ b/libiberty/testsuite/test-pexecute.c
@@ -208,11 +208,12 @@ main (int argc, char **argv)
   do                                                                   \
     {                                                                  \
       int err;                                                         \
+      const char *pex_run_err;                                         \
       if (trace)                                                       \
        fprintf (stderr, "Line %d: running %s %s\n",                    \
                 __LINE__, EXECUTABLE, ARGV[0]);                        \
-      const char *pex_run_err = pex_run (PEXOBJ, FLAGS, EXECUTABLE,    \
-                                        ARGV, OUTNAME, ERRNAME, &err); \
+      pex_run_err = pex_run (PEXOBJ, FLAGS, EXECUTABLE, ARGV, OUTNAME, \
+                            ERRNAME, &err);                            \
       if (pex_run_err != NULL)                                         \
        FATAL_ERROR (pex_run_err, err);                                 \
     }                                                                  \