diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2022-08-19 16:09:28 +0200 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2022-08-19 16:09:28 +0200 |
| commit | 713ec97e593bd4d9915a13bc4047f064fec0e24a (patch) | |
| tree | d353f0f80504617372572a6d9fe929479f4db869 | |
| parent | 338a296dd76bf3d253a990ddb65e1bbef0c680a7 (diff) | |
| download | gcc-713ec97e593bd4d9915a13bc4047f064fec0e24a.zip gcc-713ec97e593bd4d9915a13bc4047f064fec0e24a.tar.gz gcc-713ec97e593bd4d9915a13bc4047f064fec0e24a.tar.bz2 | |
mkoffload: Cleanup temporary omp_requires_file
The file (suffix ".mkoffload.omp_requires") used to save the 'omp requires'
data has to be passed to maybe_unlink for cleanup or -v -save-temps stderr
diagnostic. That was missed before. - For GCN, the same has to be done for
the files with suffix ".mkoffload.dbg.o".
gcc/ChangeLog:
* config/gcn/mkoffload.cc (main): Add omp_requires_file and dbgobj to
files_to_cleanup.
* config/i386/intelmic-mkoffload.cc (prepare_target_image): Add
omp_requires_file to temp_files.
* config/nvptx/mkoffload.cc (omp_requires_file): New global static var.
(main): Remove local omp_requires_file var.
(tool_cleanup): Handle omp_requires_file.
| -rw-r--r-- | gcc/config/gcn/mkoffload.cc | 2 | ||||
| -rw-r--r-- | gcc/config/i386/intelmic-mkoffload.cc | 1 | ||||
| -rw-r--r-- | gcc/config/nvptx/mkoffload.cc | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/gcc/config/gcn/mkoffload.cc b/gcc/config/gcn/mkoffload.cc index d246433..4206448 100644 --- a/gcc/config/gcn/mkoffload.cc +++ b/gcc/config/gcn/mkoffload.cc @@ -1030,6 +1030,7 @@ main (int argc, char **argv) } else dbgobj = make_temp_file (".mkoffload.dbg.o"); + obstack_ptr_grow (&files_to_cleanup, dbgobj); /* If the copy fails then just ignore it. */ if (copy_early_debug_info (argv[ix], dbgobj)) @@ -1085,6 +1086,7 @@ main (int argc, char **argv) omp_requires_file = concat (dumppfx, ".mkoffload.omp_requires", NULL); else omp_requires_file = make_temp_file (".mkoffload.omp_requires"); + obstack_ptr_grow (&files_to_cleanup, omp_requires_file); /* Run the compiler pass. */ xputenv (concat ("GCC_OFFLOAD_OMP_REQUIRES_FILE=", omp_requires_file, NULL)); diff --git a/gcc/config/i386/intelmic-mkoffload.cc b/gcc/config/i386/intelmic-mkoffload.cc index 596f6f1..5deddff 100644 --- a/gcc/config/i386/intelmic-mkoffload.cc +++ b/gcc/config/i386/intelmic-mkoffload.cc @@ -526,6 +526,7 @@ prepare_target_image (const char *target_compiler, int argc, char **argv, uint32 omp_requires_file = concat (dumppfx, ".mkoffload.omp_requires", NULL); else omp_requires_file = make_temp_file (".mkoffload.omp_requires"); + temp_files[num_temps++] = omp_requires_file; xputenv (concat ("GCC_OFFLOAD_OMP_REQUIRES_FILE=", omp_requires_file, NULL)); compile_for_target (&argv_obstack); diff --git a/gcc/config/nvptx/mkoffload.cc b/gcc/config/nvptx/mkoffload.cc index 0fa5f44..3eea0a8 100644 --- a/gcc/config/nvptx/mkoffload.cc +++ b/gcc/config/nvptx/mkoffload.cc @@ -55,6 +55,7 @@ static id_map *var_ids, **vars_tail = &var_ids; /* Files to unlink. */ static const char *ptx_name; static const char *ptx_cfile_name; +static const char *omp_requires_file; static const char *ptx_dumpbase; enum offload_abi offload_abi = OFFLOAD_ABI_UNSET; @@ -68,6 +69,8 @@ tool_cleanup (bool from_signal ATTRIBUTE_UNUSED) maybe_unlink (ptx_cfile_name); if (ptx_name) maybe_unlink (ptx_name); + if (omp_requires_file) + maybe_unlink (omp_requires_file); } static void @@ -586,7 +589,6 @@ main (int argc, char **argv) unsetenv ("COMPILER_PATH"); unsetenv ("LIBRARY_PATH"); - char *omp_requires_file; if (save_temps) omp_requires_file = concat (dumppfx, ".mkoffload.omp_requires", NULL); else |