diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2000-11-13 21:22:10 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2000-11-13 21:22:10 +0000 |
| commit | d9068c61428f89ce1db4bae6f5adb6acbd8b5b6b (patch) | |
| tree | fd2583d1bff6b5fbb21a491a9da567cce4465262 /gcc/c-lex.c | |
| parent | 51d61f8686efee2132bf91c5a89993c1cbf103c7 (diff) | |
| download | gcc-d9068c61428f89ce1db4bae6f5adb6acbd8b5b6b.zip gcc-d9068c61428f89ce1db4bae6f5adb6acbd8b5b6b.tar.gz gcc-d9068c61428f89ce1db4bae6f5adb6acbd8b5b6b.tar.bz2 | |
c-lex.c (cb_leave_file): Harmonize conditions and order of statements to those of process_directive for...
* c-lex.c (cb_leave_file): Harmonize conditions and order of
statements to those of process_directive for (action == act_pop).
* collect2.c (main): Pass on -B options from COLLECT_GCC_OPTIONS.
* local-alloc.c (equiv_init_movable_p): References to CC0 are not
movable.
From-SVN: r37438
Diffstat (limited to 'gcc/c-lex.c')
| -rw-r--r-- | gcc/c-lex.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 0c4fa91..7f11604 100644 --- a/gcc/c-lex.c +++ b/gcc/c-lex.c @@ -728,30 +728,34 @@ cb_leave_file (pfile) { /* Bleah, need a better interface to this. */ const char *flags = cpp_syshdr_flags (pfile, CPP_BUFFER (pfile)); -#if 0 - if (indent_level != input_file_stack->indent_level) - { - warning_with_file_and_line - (input_filename, lex_lineno, - "This file contains more '%c's than '%c's.", - indent_level > input_file_stack->indent_level ? '{' : '}', - indent_level > input_file_stack->indent_level ? '}' : '{'); - } -#endif - /* We get called for the main buffer, but we mustn't pop it. */ + if (input_file_stack->next) - pop_srcloc (); - in_system_header = (flags[0] != 0); -#ifndef NO_IMPLICIT_EXTERN_C - if (c_header_level && --c_header_level == 0) { - if (flags[2] != 0) - warning ("badly nested C headers from preprocessor"); - --pending_lang_change; - } +#ifndef NO_IMPLICIT_EXTERN_C + if (c_header_level && --c_header_level == 0) + { + if (flags[2] != 0) + warning ("badly nested C headers from preprocessor"); + --pending_lang_change; + } #endif +#if 0 + if (indent_level != input_file_stack->indent_level) + { + warning_with_file_and_line + (input_filename, lex_lineno, + "This file contains more '%c's than '%c's.", + indent_level > input_file_stack->indent_level ? '{' : '}', + indent_level > input_file_stack->indent_level ? '}' : '{'); + } +#endif + /* We get called for the main buffer, but we mustn't pop it. */ + pop_srcloc (); + debug_end_source_file (input_file_stack->line); + } + + in_system_header = (flags[0] != 0); lex_lineno = CPP_BUFFER (pfile)->lineno; - debug_end_source_file (input_file_stack->line); update_header_times (input_file_stack->name); /* Hook for C++. */ |