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.

(cherry picked from commit 713ec97e593bd4d9915a13bc4047f064fec0e24a)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index bd1d241ebeb16569abbd5bb9455184e000f16cd7..22be02a69f89da8676a567d866482ef11a526c9c 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,16 @@
+2022-08-19  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-08-19  Tobias Burnus  <tobias@codesourcery.com>
+
+       * 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.
+
 2022-08-17  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/config/gcn/mkoffload.cc b/gcc/config/gcn/mkoffload.cc
index 29aa473239c173564e856647ee86694a6a19c7fa..2f9ee883022a68989060b23b78f20590fd6f7550 100644 (file)
--- a/gcc/config/gcn/mkoffload.cc
+++ b/gcc/config/gcn/mkoffload.cc
@@ -1071,6 +1071,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))
@@ -1127,6 +1128,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 596f6f107b8c2b249d259fb50638243c1a09ed74..5deddff6ca213d47adb8aaad5cde141b4653e488 100644 (file)
--- 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 0fa5f4423bf881272429b81546b677573e7831ac..3eea0a8f138e111f3bb75055187c3c0887ca901d 100644 (file)
--- 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