diff options
| author | Rafael Espindola <espindola@gcc.gnu.org> | 2009-09-27 16:25:04 +0000 |
|---|---|---|
| committer | Rafael Espindola <espindola@gcc.gnu.org> | 2009-09-27 16:25:04 +0000 |
| commit | ea2ca633631ca9a4f58392c85f28ded55622e796 (patch) | |
| tree | 0cf7e5c867c23546dc32dcd8907fb6d8037a67ce | |
| parent | 99be70840102c8385c2f6ccfd8f2791798bff326 (diff) | |
| download | gcc-ea2ca633631ca9a4f58392c85f28ded55622e796.zip gcc-ea2ca633631ca9a4f58392c85f28ded55622e796.tar.gz gcc-ea2ca633631ca9a4f58392c85f28ded55622e796.tar.bz2 | |
Fix "merge" problem in the previous patch.
2009-09-27 Rafael Avila de Espindola <espindola@google.com>
* gengtype.c (main): Use plunge_files instead of plugin_output.
From-SVN: r152224
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/gengtype.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5760447..9345a08 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2009-09-27 Rafael Avila de Espindola <espindola@google.com> + + * gengtype.c (main): Use plunge_files instead of plugin_output. + 2009-09-27 Basile Starynkevitch <basile@starynkevitch.net> Rafael Avila de Espindola <espindola@google.com> @@ -26829,3 +26833,6 @@ Copyright (C) 2009 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice and this notice are preserved. + + LocalWords: gengtype + diff --git a/gcc/gengtype.c b/gcc/gengtype.c index 75b899b..0b5def7 100644 --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -3729,12 +3729,12 @@ main (int argc, char **argv) open_base_files (); write_enum_defn (structures, param_structs); write_types (header_file, structures, param_structs, &ggc_wtd); - if (plugin_output == NULL) + if (plugin_files == NULL) { write_types (header_file, structures, param_structs, &pch_wtd); write_local (header_file, structures, param_structs); } - write_roots (variables, plugin_output == NULL); + write_roots (variables, plugin_files == NULL); write_rtx_next (); close_output_files (); |