collect-utils.c, lto-wrapper + mkoffload: Improve -save-temps filename
gcc/ChangeLog:
* collect-utils.c (collect_execute, fork_execute): Add at-file suffix
argument.
* collect-utils.h (collect_execute, fork_execute): Update prototype.
* collect2.c (maybe_run_lto_and_relink, do_link, main, do_dsymutil):
Update calls by passing NULL.
* config/i386/intelmic-mkoffload.c (compile_for_target,
generate_host_descr_file, prepare_target_image, main): Likewise.
* config/gcn/mkoffload.c (compile_native, main): Pass at-file suffix.
* config/nvptx/mkoffload.c (compile_native, main): Likewise.
* lto-wrapper.c (compile_offload_image): Likewise.
gcc/collect-utils.c | 13 +++++++++----
gcc/collect-utils.h | 4 ++--
gcc/collect2.c | 17 +++++++++--------
gcc/config/gcn/mkoffload.c | 7 ++++---
gcc/config/i386/intelmic-mkoffload.c | 12 ++++++------
gcc/config/nvptx/mkoffload.c | 6 ++++--
gcc/lto-wrapper.c | 13 +++++++++----
7 files changed, 43 insertions(+), 29 deletions(-)
@@ -104,7 +104,8 @@ do_wait (const char *prog, struct pex_obj *pex)
struct pex_obj *
collect_execute (const char *prog, char **argv, const char *outname,
- const char *errname, int flags, bool use_atfile)
+ const char *errname, int flags, bool use_atfile,
+ const char *atsuffix)
{
struct pex_obj *pex;
const char *errmsg;
@@ -126,7 +127,10 @@ collect_execute (const char *prog, char **argv, const char *outname,
/* Note: we assume argv contains at least one element; this is
checked above. */
- response_file = make_temp_file ("");
+ if (!save_temps || !atsuffix)
+ response_file = make_temp_file ("");
+ else
+ response_file = concat (dumppfx, atsuffix, NULL);
f = fopen (response_file, "w");
@@ -202,12 +206,13 @@ collect_execute (const char *prog, char **argv, const char *outname,
}
void
-fork_execute (const char *prog, char **argv, bool use_atfile)
+fork_execute (const char *prog, char **argv, bool use_atfile,
+ const char *atsuffix)
{
struct pex_obj *pex;
pex = collect_execute (prog, argv, NULL, NULL,
- PEX_LAST | PEX_SEARCH, use_atfile);
+ PEX_LAST | PEX_SEARCH, use_atfile, atsuffix);
do_wait (prog, pex);
}
@@ -27,10 +27,10 @@ extern void fatal_signal (int);
extern struct pex_obj *collect_execute (const char *, char **,
const char *, const char *,
- int, bool);
+ int, bool, const char *);
extern int collect_wait (const char *, struct pex_obj *);
extern void do_wait (const char *, struct pex_obj *);
-extern void fork_execute (const char *, char **, bool);
+extern void fork_execute (const char *, char **, bool, const char *);
extern void utils_cleanup (bool);
@@ -644,7 +644,7 @@ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst,
/* Run the LTO back end. */
pex = collect_execute (prog, lto_c_argv, NULL, NULL, PEX_SEARCH,
- at_file_supplied);
+ at_file_supplied, NULL);
{
int c;
FILE *stream;
@@ -727,7 +727,8 @@ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst,
/* Run the linker again, this time replacing the object files
optimized by the LTO with the temporary file generated by the LTO. */
- fork_execute ("ld", out_lto_ld_argv, HAVE_GNU_LD && at_file_supplied);
+ fork_execute ("ld", out_lto_ld_argv, HAVE_GNU_LD && at_file_supplied,
+ NULL);
/* We assume that temp files were created, and therefore we need to take
that into account (maybe run dsymutil). */
post_ld_pass (/*temp_file*/true);
@@ -739,7 +740,7 @@ maybe_run_lto_and_relink (char **lto_ld_argv, char **object_lst,
{
/* Our caller is relying on us to do the link
even though there is no LTO back end work to be done. */
- fork_execute ("ld", lto_ld_argv, HAVE_GNU_LD && at_file_supplied);
+ fork_execute ("ld", lto_ld_argv, HAVE_GNU_LD && at_file_supplied, NULL);
/* No LTO objects were found, so no new temp file. */
post_ld_pass (/*temp_file*/false);
}
@@ -756,7 +757,7 @@ do_link (char **ld_argv)
const char *prog = "ld";
pex = collect_execute (prog, ld_argv, NULL, NULL,
PEX_LAST | PEX_SEARCH,
- HAVE_GNU_LD && at_file_supplied);
+ HAVE_GNU_LD && at_file_supplied, NULL);
int ret = collect_wait (prog, pex);
if (ret)
{
@@ -1722,7 +1723,7 @@ main (int argc, char **argv)
strip_argv[0] = strip_file_name;
strip_argv[1] = output_file;
strip_argv[2] = (char *) 0;
- fork_execute ("strip", real_strip_argv, false);
+ fork_execute ("strip", real_strip_argv, false, NULL);
}
#ifdef COLLECT_EXPORT_LIST
@@ -1805,7 +1806,7 @@ main (int argc, char **argv)
/* Assemble the constructor and destructor tables.
Link the tables in with the rest of the program. */
- fork_execute ("gcc", c_argv, at_file_supplied);
+ fork_execute ("gcc", c_argv, at_file_supplied, NULL);
#ifdef COLLECT_EXPORT_LIST
/* On AIX we must call link because of possible templates resolution. */
do_link (ld2_argv);
@@ -1818,7 +1819,7 @@ main (int argc, char **argv)
maybe_run_lto_and_relink (ld2_argv, object_lst, object, true);
else
{
- fork_execute ("ld", ld2_argv, HAVE_GNU_LD && at_file_supplied);
+ fork_execute ("ld", ld2_argv, HAVE_GNU_LD && at_file_supplied, NULL);
post_ld_pass (/*temp_file*/false);
}
@@ -3040,7 +3041,7 @@ do_dsymutil (const char *output_file) {
argv[2] = (char *) 0;
pex = collect_execute (dsymutil, real_argv, NULL, NULL,
- PEX_LAST | PEX_SEARCH, false);
+ PEX_LAST | PEX_SEARCH, false, NULL);
do_wait (dsymutil, pex);
}
@@ -737,7 +737,8 @@ compile_native (const char *infile, const char *outfile, const char *compiler,
obstack_ptr_grow (&argv_obstack, NULL);
const char **new_argv = XOBFINISH (&argv_obstack, const char **);
- fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true);
+ fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true,
+ ".gccnative_args");
obstack_free (&argv_obstack, NULL);
}
@@ -1001,7 +1002,7 @@ main (int argc, char **argv)
unsetenv ("LIBRARY_PATH");
/* Run the compiler pass. */
- fork_execute (cc_argv[0], CONST_CAST (char **, cc_argv), true);
+ fork_execute (cc_argv[0], CONST_CAST (char **, cc_argv), true, ".gcc_args");
obstack_free (&cc_argv_obstack, NULL);
in = fopen (gcn_s1_name, "r");
@@ -1022,7 +1023,7 @@ main (int argc, char **argv)
fclose (out);
/* Run the assemble/link pass. */
- fork_execute (ld_argv[0], CONST_CAST (char **, ld_argv), true);
+ fork_execute (ld_argv[0], CONST_CAST (char **, ld_argv), true, ".ld_args");
obstack_free (&ld_argv_obstack, NULL);
in = fopen (gcn_o_name, "r");
@@ -231,7 +231,7 @@ compile_for_target (struct obstack *argv_obstack)
unsetenv ("LIBRARY_PATH");
unsetenv ("LD_RUN_PATH");
- fork_execute (argv[0], argv, false);
+ fork_execute (argv[0], argv, false, NULL);
obstack_free (argv_obstack, NULL);
/* Restore environment variables. */
@@ -455,7 +455,7 @@ generate_host_descr_file (const char *host_compiler)
obstack_ptr_grow (&argv_obstack, NULL);
char **argv = XOBFINISH (&argv_obstack, char **);
- fork_execute (argv[0], argv, false);
+ fork_execute (argv[0], argv, false, NULL);
obstack_free (&argv_obstack, NULL);
return obj_filename;
@@ -538,7 +538,7 @@ prepare_target_image (const char *target_compiler, int argc, char **argv)
obstack_ptr_grow (&argv_obstack, rename_section_opt);
obstack_ptr_grow (&argv_obstack, NULL);
char **new_argv = XOBFINISH (&argv_obstack, char **);
- fork_execute (new_argv[0], new_argv, false);
+ fork_execute (new_argv[0], new_argv, false, NULL);
obstack_free (&argv_obstack, NULL);
/* Objcopy has created symbols, containing the input file name with
@@ -580,7 +580,7 @@ prepare_target_image (const char *target_compiler, int argc, char **argv)
obstack_ptr_grow (&argv_obstack, opt_for_objcopy[2]);
obstack_ptr_grow (&argv_obstack, NULL);
new_argv = XOBFINISH (&argv_obstack, char **);
- fork_execute (new_argv[0], new_argv, false);
+ fork_execute (new_argv[0], new_argv, false, NULL);
obstack_free (&argv_obstack, NULL);
return target_so_filename;
@@ -672,7 +672,7 @@ main (int argc, char **argv)
obstack_ptr_grow (&argv_obstack, out_obj_filename);
obstack_ptr_grow (&argv_obstack, NULL);
char **new_argv = XOBFINISH (&argv_obstack, char **);
- fork_execute (new_argv[0], new_argv, false);
+ fork_execute (new_argv[0], new_argv, false, NULL);
obstack_free (&argv_obstack, NULL);
/* Run objcopy on the resultant object file to localize generated symbols
@@ -688,7 +688,7 @@ main (int argc, char **argv)
obstack_ptr_grow (&argv_obstack, out_obj_filename);
obstack_ptr_grow (&argv_obstack, NULL);
new_argv = XOBFINISH (&argv_obstack, char **);
- fork_execute (new_argv[0], new_argv, false);
+ fork_execute (new_argv[0], new_argv, false, NULL);
obstack_free (&argv_obstack, NULL);
return 0;
@@ -399,7 +399,8 @@ compile_native (const char *infile, const char *outfile, const char *compiler,
obstack_ptr_grow (&argv_obstack, NULL);
const char **new_argv = XOBFINISH (&argv_obstack, const char **);
- fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true);
+ fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true,
+ ".gccnative_args");
obstack_free (&argv_obstack, NULL);
}
@@ -582,7 +583,8 @@ main (int argc, char **argv)
unsetenv ("COMPILER_PATH");
unsetenv ("LIBRARY_PATH");
- fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true);
+ fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true,
+ ".gcc_args");
obstack_free (&argv_obstack, NULL);
xputenv (concat ("GCC_EXEC_PREFIX=", execpath, NULL));
@@ -950,7 +950,7 @@ compile_offload_image (const char *target, const char *compiler_path,
obstack_ptr_grow (&argv_obstack, NULL);
argv = XOBFINISH (&argv_obstack, char **);
- fork_execute (argv[0], argv, true);
+ fork_execute (argv[0], argv, true, "offload_args");
obstack_free (&argv_obstack, NULL);
free_array_of_ptrs ((void **) paths, n_paths);
@@ -1777,7 +1777,8 @@ cont1:
new_argv = XOBFINISH (&argv_obstack, const char **);
argv_ptr = &new_argv[new_head_argc];
- fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true);
+ fork_execute (new_argv[0], CONST_CAST (char **, new_argv), true,
+ "ltrans_args");
/* Copy the early generated debug info from the objects to temporary
files and append those to the partial link commandline. */
@@ -1921,8 +1922,12 @@ cont:
}
else
{
+ char argsuffix[sizeof (DUMPBASE_SUFFIX) + 1];
+ if (save_temps)
+ snprintf (dumpbase, sizeof (DUMPBASE_SUFFIX),
+ "ltrans%u.ltrans_args", i);
fork_execute (new_argv[0], CONST_CAST (char **, new_argv),
- true);
+ true, save_temps ? argsuffix : NULL);
maybe_unlink (input_name);
}
@@ -1973,7 +1978,7 @@ cont:
new_argv = XOBFINISH (&argv_obstack, const char **);
pex = collect_execute (new_argv[0], CONST_CAST (char **, new_argv),
- NULL, NULL, PEX_SEARCH, false);
+ NULL, NULL, PEX_SEARCH, false, NULL);
do_wait (new_argv[0], pex);
freeargv (make_argv);
maybe_unlink (makefile);