summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>1999-09-05 16:30:48 +0000
committerMarc Espie <espie@cvs.openbsd.org>1999-09-05 16:30:48 +0000
commit54eae00b57fc4cff56d2ede6fa1f2e03dc233f06 (patch)
treeb1680da0237e14b7dd03fd72387b0018e564921f
parentaa308abd43670192b1baa8d3d2cad7d189bb9708 (diff)
Put choose_temp_base call back in msdos dependent code.
(from the egcs mainline, code by myself). This should remove the last use of choose_temp_base. Once I've rebuilt the whole tree, there's another patch to make that code properly #ifdef MSDOS.
-rw-r--r--gnu/egcs/gcc/protoize.c3
-rw-r--r--gnu/egcs/libiberty/pexecute.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/egcs/gcc/protoize.c b/gnu/egcs/gcc/protoize.c
index 7e9205cb1a8..bdb19d121ce 100644
--- a/gnu/egcs/gcc/protoize.c
+++ b/gnu/egcs/gcc/protoize.c
@@ -2075,10 +2075,9 @@ gen_aux_info_file (base_filename)
{
char *errmsg_fmt, *errmsg_arg;
int wait_status, pid;
- char *temp_base = choose_temp_base ();
pid = pexecute (compile_params[0], (char * const *) compile_params,
- pname, temp_base, &errmsg_fmt, &errmsg_arg,
+ pname, NULL, &errmsg_fmt, &errmsg_arg,
PEXECUTE_FIRST | PEXECUTE_LAST | PEXECUTE_SEARCH);
if (pid == -1)
diff --git a/gnu/egcs/libiberty/pexecute.c b/gnu/egcs/libiberty/pexecute.c
index 6f6a0449d09..dffd04f5a91 100644
--- a/gnu/egcs/libiberty/pexecute.c
+++ b/gnu/egcs/libiberty/pexecute.c
@@ -156,6 +156,8 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
FILE *argfile;
int i, el = flags & PEXECUTE_SEARCH ? 4 : 0;
+ if (temp_base == 0)
+ temp_base = choose_temp_base ();
scmd = (char *) xmalloc (strlen (program) + strlen (temp_base) + 6 + el);
rf = scmd + strlen(program) + 2 + el;
sprintf (scmd, "%s%s @%s.gp", program,