From 1fff69c9a4ac6a18dcb45abbb311ae1e3e96c6e7 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 29 Mar 2005 19:39:35 +0000 Subject: re PR bootstrap/14316 (collect2 doesnt build on windows hosts) PR bootstrap/14316 * collect2.c: Never include . (VFORK_STRING, vfork): Don't define. (pid): Remove global variable. (handler): Call raise instead of kill (getpid(), ...). (collect_wait): Add pex parameter. Change all callers. Use pex_get_status rather than pwait. (do_wait): Add pex parameter. Change all callers. (collect_execute): Return struct pex_obj * rather than void. Use pex routines rather than pexecute. (fork_execute): Get pex_obj from collect_execute, and pass it to do_wait. (scan_prog_file): Use pex routines rather than pipe/vfork/exec. Only declare quit_handler if SIGQUIT is defined. (scan_libraries): Likewise. * collect2.h (collect_execute): Update declaration. (collect_wait): Update declaration. * tlink.c (tlink_execute): Get pex_obj from collect_execute, and pass it to collect_wait. From-SVN: r97199 --- gcc/tlink.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gcc/tlink.c') diff --git a/gcc/tlink.c b/gcc/tlink.c index f09a865..bf4e1d7 100644 --- a/gcc/tlink.c +++ b/gcc/tlink.c @@ -1,7 +1,7 @@ /* Scan linker error messages for missing template instantiations and provide them. - Copyright (C) 1995, 1998, 1999, 2000, 2001, 2003, 2004 + Copyright (C) 1995, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by Jason Merrill (jason@cygnus.com). @@ -281,8 +281,10 @@ tlink_init (void) static int tlink_execute (const char *prog, char **argv, const char *redir) { - collect_execute (prog, argv, redir); - return collect_wait (prog); + struct pex_obj *pex; + + pex = collect_execute (prog, argv, redir); + return collect_wait (prog, pex); } static char * -- cgit v1.1