[patch] Delete temporary response file

[patch] Delete temporary response file

[Eric Botcazou]

[-- Attachment #1: Type: text/plain, Size: 987 bytes --]

Hi,

when you pass a response file at link time and you use the GNU linker, then 
collect2 creates another, temporary response file and passes it to the linker.
But it fails to delete the file after it is done.  This can easily be seen 
with the following manipulation:

eric@polaris:~/build/gcc/native> cat t.c
int main (void) { return 0; }
eric@polaris:~/build/gcc/native> cat t.resp
-L/usr/lib64
eric@polaris:~/build/gcc/native> gcc -c t.c
eric@polaris:~/build/gcc/native> export TMPDIR=$PWD
eric@polaris:~/build/gcc/native> gcc -o t t.o @t.resp
eric@polaris:~/build/gcc/native> ls cc*
ccVSQ6W5

The problem is that do_wait is not invoked by tlink_execute, only collect_wait 
is, so the cleanup code present therein is never invoked.

Tested on x86_64-suse-linux, OK for the mainline?


2015-06-22  Tristan Gingold  <gingold@adacore.com>

	* collect2.c (collect_wait): Unlink the response file here instead of...
	(do_wait): ...here.
	(utils_cleanup): ...and here.


-- 
Eric Botcazou

[-- Attachment #2: p.diff --]
[-- Type: text/x-patch, Size: 1000 bytes --]

Index: collect-utils.c
===================================================================
--- collect-utils.c	(revision 224708)
+++ collect-utils.c	(working copy)
@@ -68,6 +68,12 @@ collect_wait (const char *prog, struct p
     fatal_error (input_location, "can't get program status: %m");
   pex_free (pex);
 
+  if (response_file && !save_temps)
+    {
+      unlink (response_file);
+      response_file = NULL;
+    }
+
   if (status)
     {
       if (WIFSIGNALED (status))
@@ -90,12 +96,6 @@ do_wait (const char *prog, struct pex_ob
   int ret = collect_wait (prog, pex);
   if (ret != 0)
     fatal_error (input_location, "%s returned %d exit status", prog, ret);
-
-  if (response_file && !save_temps)
-    {
-      unlink (response_file);
-      response_file = NULL;
-    }
 }
 
 \f
@@ -224,7 +224,5 @@ utils_cleanup (bool from_signal)
      calls to maybe_unlink fails. */
   cleanup_done = true;
 
-  if (response_file)
-    maybe_unlink (response_file);
   tool_cleanup (from_signal);
 }

Re: [patch] Delete temporary response file

[Jeff Law]

On 06/22/2015 11:37 AM, Eric Botcazou wrote:
> Hi,
>
> when you pass a response file at link time and you use the GNU linker, then
> collect2 creates another, temporary response file and passes it to the linker.
> But it fails to delete the file after it is done.  This can easily be seen
> with the following manipulation:
>
> eric@polaris:~/build/gcc/native> cat t.c
> int main (void) { return 0; }
> eric@polaris:~/build/gcc/native> cat t.resp
> -L/usr/lib64
> eric@polaris:~/build/gcc/native> gcc -c t.c
> eric@polaris:~/build/gcc/native> export TMPDIR=$PWD
> eric@polaris:~/build/gcc/native> gcc -o t t.o @t.resp
> eric@polaris:~/build/gcc/native> ls cc*
> ccVSQ6W5
>
> The problem is that do_wait is not invoked by tlink_execute, only collect_wait
> is, so the cleanup code present therein is never invoked.
>
> Tested on x86_64-suse-linux, OK for the mainline?
>
>
> 2015-06-22  Tristan Gingold  <gingold@adacore.com>
>
> 	* collect2.c (collect_wait): Unlink the response file here instead of...
> 	(do_wait): ...here.
> 	(utils_cleanup): ...and here.
OK.
jeff