diff options
author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2014-11-19 18:11:54 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-11-19 19:11:54 +0100 |
commit | 92c66d8311bb83157dbbf0008f750e12761d5296 (patch) | |
tree | 0690a3599553e53757cc482d3b100c50431a782a /gcc | |
parent | 0162cb3bb7832f02c355503a04c3d443035bdda4 (diff) | |
download | gcc-92c66d8311bb83157dbbf0008f750e12761d5296.zip gcc-92c66d8311bb83157dbbf0008f750e12761d5296.tar.gz gcc-92c66d8311bb83157dbbf0008f750e12761d5296.tar.bz2 |
re PR driver/36312 (should refuse to overwrite input file with output file)
PR driver/36312
PR driver/63837
* gcc.c (process_command): Don't check for input/output
filename equality if output is HOST_BIT_BUCKET.
* toplev.c (init_asm_output): Likewise.
Co-Authored-By: Jakub Jelinek <jakub@redhat.com>
From-SVN: r217789
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 9 | ||||
-rw-r--r-- | gcc/gcc.c | 4 | ||||
-rw-r--r-- | gcc/toplev.c | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 791599f..15010a0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2014-11-19 Manuel López-Ibáñez <manu@gcc.gnu.org> + Jakub Jelinek <jakub@redhat.com> + + PR driver/36312 + PR driver/63837 + * gcc.c (process_command): Don't check for input/output + filename equality if output is HOST_BIT_BUCKET. + * toplev.c (init_asm_output): Likewise. + 2014-11-19 David Malcolm <dmalcolm@redhat.com> Merger of git branch "gimple-classes-v2-option-3". @@ -4155,7 +4155,9 @@ process_command (unsigned int decoded_options_count, CL_DRIVER, &handlers, global_dc); } - if (output_file && strcmp (output_file, "-")) + if (output_file + && strcmp (output_file, "-") != 0 + && strcmp (output_file, HOST_BIT_BUCKET) != 0) { int i; for (i = 0; i < n_infiles; i++) diff --git a/gcc/toplev.c b/gcc/toplev.c index 2e48047..86c4b81 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -945,7 +945,8 @@ init_asm_output (const char *name) } if (!strcmp (asm_file_name, "-")) asm_out_file = stdout; - else if (!canonical_filename_eq (asm_file_name, name)) + else if (!canonical_filename_eq (asm_file_name, name) + || !strcmp (asm_file_name, HOST_BIT_BUCKET)) asm_out_file = fopen (asm_file_name, "w"); else /* Use fatal_error (UNKOWN_LOCATION) instead of just fatal_error to |