diff options
author | Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2007-09-24 20:24:11 +0000 |
---|---|---|
committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2007-09-24 20:24:11 +0000 |
commit | 7b7bdf67e021444850352aebe14b288aca4c29c7 (patch) | |
tree | a958df7338069ae35548c9829c1e33474fb581be /gcc/fortran/scanner.c | |
parent | 06d20fa91b82080984cedf14c7f06b55f646be8b (diff) | |
download | gcc-7b7bdf67e021444850352aebe14b288aca4c29c7.zip gcc-7b7bdf67e021444850352aebe14b288aca4c29c7.tar.gz gcc-7b7bdf67e021444850352aebe14b288aca4c29c7.tar.bz2 |
re PR fortran/33538 (bootstrap break in fortran on *-apple-darwin r128671)
PR fortran/33538
* scanner.c, parse.c, gfortran.h: Revert revision 128671.
From-SVN: r128724
Diffstat (limited to 'gcc/fortran/scanner.c')
-rw-r--r-- | gcc/fortran/scanner.c | 57 |
1 files changed, 2 insertions, 55 deletions
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index 1db4542..682c60c 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -45,8 +45,6 @@ along with GCC; see the file COPYING3. If not see #include "system.h" #include "gfortran.h" #include "toplev.h" -#include "debug.h" -#include "flags.h" /* Structure for holding module and include file search path. */ typedef struct gfc_directorylist @@ -314,20 +312,6 @@ gfc_advance_line (void) return; } - if (gfc_current_locus.lb->next) - { - if (gfc_current_locus.lb->file->next - && gfc_current_locus.lb->file->up == gfc_current_locus.lb->file->next) - /* We exit from an included file. */ - (*debug_hooks->end_source_file) - (gfc_linebuf_linenum (gfc_current_locus.lb->next)); - else if (gfc_current_locus.lb->next->file != gfc_current_locus.lb->file) - /* We enter into a new file. */ - (*debug_hooks->start_source_file) - (gfc_linebuf_linenum (gfc_current_locus.lb), - gfc_current_locus.lb->next->file->filename); - } - gfc_current_locus.lb = gfc_current_locus.lb->next; if (gfc_current_locus.lb != NULL) @@ -388,31 +372,6 @@ skip_comment_line (void) } -int -gfc_define_undef_line (void) -{ - /* All lines beginning with '#' are either #define or #undef. */ - if (! (debug_info_level == DINFO_LEVEL_VERBOSE - && (write_symbols == DWARF2_DEBUG - || write_symbols == VMS_AND_DWARF2_DEBUG)) - || gfc_peek_char () != '#') - return 0; - - if (strncmp (gfc_current_locus.nextc, "#define ", 8) == 0) - (*debug_hooks->define) (gfc_linebuf_linenum (gfc_current_locus.lb), - &(gfc_current_locus.nextc[8])); - - if (strncmp (gfc_current_locus.nextc, "#undef ", 7) == 0) - (*debug_hooks->undef) (gfc_linebuf_linenum (gfc_current_locus.lb), - &(gfc_current_locus.nextc[7])); - - /* Skip the rest of the line. */ - skip_comment_line (); - - return 1; -} - - /* Comment lines are null lines, lines containing only blanks or lines on which the first nonblank line is a '!'. Return true if !$ openmp conditional compilation sentinel was @@ -1546,20 +1505,8 @@ load_file (const char *filename, bool initial) if (line[0] == '#') { - /* When -g3 is specified, it's possible that we emit #define - and #undef lines, which we need to pass to the middle-end - so that it can emit correct debug info. */ - if (debug_info_level == DINFO_LEVEL_VERBOSE - && (write_symbols == DWARF2_DEBUG - || write_symbols == VMS_AND_DWARF2_DEBUG) - && (strncmp (line, "#define ", 8) == 0 - || strncmp (line, "#undef ", 7) == 0)) - ; - else - { - preprocessor_line (line); - continue; - } + preprocessor_line (line); + continue; } /* Preprocessed files have preprocessor lines added before the byte |