summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/gcc.c36
2 files changed, 22 insertions, 18 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 28fd31f3379..c8d93ffc42c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-09 Richard Guenther <rguenther@suse.de>
+
+ * gcc.c (store_arg): Revert last change.
+
2010-05-08 Sandra Loosemore <sandra@codesourcery.com>
PR middle-end/28685
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 7e4343de4ac..a0083e1d0f6 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2045,23 +2045,6 @@ static int signal_count;
/* Name with which this program was invoked. */
static const char *programname;
-
-/* This is the common prefix we use to make temp file names.
- It is chosen once for each run of this program.
- It is substituted into a spec by %g or %j.
- Thus, all temp file names contain this prefix.
- In practice, all temp file names start with this prefix.
-
- This prefix comes from the envvar TMPDIR if it is defined;
- otherwise, from the P_tmpdir macro if that is defined;
- otherwise, in /usr/tmp or /tmp;
- or finally the current directory if all else fails. */
-
-static const char *temp_filename;
-
-/* Length of the prefix. */
-
-static int temp_filename_length;
/* Allocate the argument vector. */
@@ -2099,7 +2082,7 @@ store_arg (const char *arg, int delete_always, int delete_failure)
if (strcmp (arg, "-o") == 0)
have_o_argbuf_index = argbuf_index;
if (delete_always || delete_failure)
- record_temp_file (temp_filename, delete_always, delete_failure);
+ record_temp_file (arg, delete_always, delete_failure);
}
/* Load specs from a file name named FILENAME, replacing occurrences of
@@ -2402,6 +2385,23 @@ read_specs (const char *filename, int main_p)
/* Record the names of temporary files we tell compilers to write,
and delete them at the end of the run. */
+/* This is the common prefix we use to make temp file names.
+ It is chosen once for each run of this program.
+ It is substituted into a spec by %g or %j.
+ Thus, all temp file names contain this prefix.
+ In practice, all temp file names start with this prefix.
+
+ This prefix comes from the envvar TMPDIR if it is defined;
+ otherwise, from the P_tmpdir macro if that is defined;
+ otherwise, in /usr/tmp or /tmp;
+ or finally the current directory if all else fails. */
+
+static const char *temp_filename;
+
+/* Length of the prefix. */
+
+static int temp_filename_length;
+
/* Define the list of temporary files to delete. */
struct temp_file
OpenPOWER on IntegriCloud