diff options
Diffstat (limited to 'gcc/f')
| -rw-r--r-- | gcc/f/Make-lang.in | 2 | ||||
| -rw-r--r-- | gcc/f/lex.c | 28 |
2 files changed, 9 insertions, 21 deletions
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index 69d6e17..df0a4d1 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -467,7 +467,7 @@ f/lex.o: f/lex.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/top.h f/malloc.h f/where.h \ f/bld-op.def f/bit.h f/info.h f/info-b.def f/info-k.def f/info-w.def \ f/target.h f/lex.h f/type.h f/intrin.h f/intrin.def f/lab.h f/symbol.h \ f/symbol.def f/equiv.h f/storag.h f/global.h f/name.h f/src.h flags.h \ - input.h toplev.h output.h $(GGC_H) + debug.h input.h toplev.h output.h $(GGC_H) f/malloc.o: f/malloc.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/malloc.h f/name.o: f/name.c f/proj.h $(CONFIG_H) $(SYSTEM_H) f/bad.h f/bad.def f/where.h \ glimits.h f/top.h f/malloc.h f/name.h f/global.h f/info.h f/info-b.def \ diff --git a/gcc/f/lex.c b/gcc/f/lex.c index d5aaa15..70f666a 100644 --- a/gcc/f/lex.c +++ b/gcc/f/lex.c @@ -26,6 +26,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "lex.h" #include "malloc.h" #include "src.h" +#include "debug.h" #if FFECOM_targetCURRENT == FFECOM_targetGCC #include "flags.h" #include "input.h" @@ -34,10 +35,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "ggc.h" #endif -#ifdef DWARF_DEBUGGING_INFO -#include "dwarfout.h" -#endif - static void ffelex_append_to_token_ (char c); static int ffelex_backslash_ (int c, ffewhereColumnNumber col); static void ffelex_bad_1_ (ffebad errnum, ffewhereLineNumber ln0, @@ -860,11 +857,8 @@ ffelex_file_pop_ (const char *input_filename) input_file_stack = p->next; free (p); input_file_stack_tick++; -#ifdef DWARF_DEBUGGING_INFO - if (debug_info_level == DINFO_LEVEL_VERBOSE - && write_symbols == DWARF_DEBUG) - dwarfout_resume_previous_source_file (input_file_stack->line); -#endif /* DWARF_DEBUGGING_INFO */ + if (write_symbols == DWARF_DEBUG) + (*debug_hooks->end_source_file) (input_file_stack->line); } else error ("#-lines for entering and leaving files don't match"); @@ -888,11 +882,9 @@ ffelex_file_push_ (int old_lineno, const char *input_filename) p->name = input_filename; input_file_stack = p; input_file_stack_tick++; -#ifdef DWARF_DEBUGGING_INFO - if (debug_info_level == DINFO_LEVEL_VERBOSE - && write_symbols == DWARF_DEBUG) - dwarfout_start_new_source_file (input_filename); -#endif /* DWARF_DEBUGGING_INFO */ + + if (write_symbols == DWARF_DEBUG) + (*debug_hooks->start_source_file) (0, input_filename); /* Now that we've pushed or popped the input stack, update the name in the top element. */ @@ -1173,11 +1165,9 @@ ffelex_hash_ (FILE *finput) c = ffelex_get_directive_line_ (&text, finput); -#ifdef DWARF_DEBUGGING_INFO if ((debug_info_level == DINFO_LEVEL_VERBOSE) && (write_symbols == DWARF_DEBUG)) - dwarfout_define (lineno, text); -#endif /* DWARF_DEBUGGING_INFO */ + (*debug_hooks->define) (lineno, text); goto skipline; } @@ -1195,11 +1185,9 @@ ffelex_hash_ (FILE *finput) c = ffelex_get_directive_line_ (&text, finput); -#ifdef DWARF_DEBUGGING_INFO if ((debug_info_level == DINFO_LEVEL_VERBOSE) && (write_symbols == DWARF_DEBUG)) - dwarfout_undef (lineno, text); -#endif /* DWARF_DEBUGGING_INFO */ + (*debug_hooks->undef) (lineno, text); goto skipline; } |