diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cpplex.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 27ed4dd..c18716e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Tue 19-Sep-2000 22:38:57 BST Neil Booth <NeilB@earthling.net> + + * cpplex.c (lex_line): Drop the EOF token for unknown + directives in assembler. + 2000-09-19 David Edelsohn <edelsohn@gnu.org> * configure.in: Allow enable_threads_flag value of "aix". Define diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 4e321b6..c0bf875 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -1669,11 +1669,6 @@ lex_line (pfile, list) first->flags |= BOL; pfile->first_directive_token = first; - /* Drop the EOF unless really at EOF or in a directive. */ - if (!(cur_token == first || pfile->state.in_directive - || !pfile->done_initializing)) - list->tokens_used--; - /* Don't complain about the null directive, nor directives in assembly source: we don't know where the comments are, and # may introduce assembler pseudo-ops. Don't complain about invalid @@ -1697,6 +1692,11 @@ lex_line (pfile, list) goto retry; } + /* Drop the EOF unless really at EOF or in a directive. */ + if (cur_token != first && !KNOWN_DIRECTIVE (list) + && pfile->done_initializing) + list->tokens_used--; + pfile->state.in_lex_line = 0; } |