From: DJ Delorie <dj@redhat.com>
Date: Fri, 2 Jun 2006 15:37:03 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7741be99dddd09a13a58229705190e53ecf5ffc1;p=binutils-gdb.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index e2899c0ae09..93f8449f65b 100644
--- 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 91619af1e2c..e006e599297 100644
--- 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)
 	{