merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index e2899c0ae09e79284a44f1ed3c67e3521b429f17..93f8449f65bab4ed9cbab4bae19f0993e9bab16c 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-02  Mark Shinwell  <shinwell@codesourcery.com>
+
+       * pex-unix.c (pex_unix_exec_child): Insert cast when assigning
+       to environ.
+
 2006-06-01  Mark Shinwell  <shinwell@codesourcery.com>
 
        * pex-common.c: New function pex_run_in_environment.

diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c
index 91619af1e2cbc7404bdf868a9d88d7cfaa0ce864..e006e5992978b67591ff990c07ba57e15dad0f63 100644 (file)
--- a/libiberty/pex-unix.c
+++ b/libiberty/pex-unix.c
@@ -415,7 +415,7 @@ pex_unix_exec_child (struct pex_obj *obj, int flags, const char *executable,
        }
 
       if (env)
-        environ = env;
+        environ = (char**) env;
 
       if ((flags & PEX_SEARCH) != 0)
        {