* emultempl/spuelf.em (spu_elf_relink): Use pex_one in place

	of execvp.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0d6bd931d9d007d329b2710f9c5f0a196c7d69f6..25d2f2363324d6c5e8efe85cbfb8866e25da39ac 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-01  Nick Clifton  <nickc@redhat.com>
+
+       * emultempl/spuelf.em (spu_elf_relink): Use pex_one in place
+       of execvp.
+
 2011-11-25  John Tytgat  <john@bass-software.com>
 
        * emultempl/armelf.em: Update copyright to 2010 and 2011.

diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index 92f2d163d3d229eb8f662dd14002548ed0b76509..714d33d803374285e916de585296733270f37724 100644 (file)
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -384,9 +384,13 @@ spu_elf_open_overlay_script (void)
   return script;
 }
 
+#include <errno.h>
+
 static void
 spu_elf_relink (void)
 {
+  const char *pex_return;
+  int status;
   char **argv = xmalloc ((my_argc + 4) * sizeof (*argv));
 
   memcpy (argv, my_argv, my_argc * sizeof (*argv));
@@ -397,9 +401,16 @@ spu_elf_relink (void)
   argv[my_argc++] = "-T";
   argv[my_argc++] = auto_overlay_file;
   argv[my_argc] = 0;
-  execvp (argv[0], (char *const *) argv);
-  perror (argv[0]);
-  _exit (127);
+
+  pex_return = pex_one (PEX_SEARCH | PEX_LAST, (const char *) argv[0],
+                       (char * const *) argv, (const char *) argv[0],
+                       NULL, NULL, & status, & errno);
+  if (pex_return != NULL)
+    {
+      perror (pex_return);
+      _exit (127);
+    }
+  exit (status);
 }
 
 /* Final emulation specific call.  */