Makefile.in (c-lex.o): Wrap long lines.

	* Makefile.in (c-lex.o): Wrap long lines.  Depend on debug.h.
	* c-lex.c (cb_file_change, cb_define, cb_undef): Use debug
	hooks directly.
	* dbxout.c (dbx_debug_hooks): Add new hooks.
	(dbxout_start_new_source_file): Rename dbxout_start_source_file,
	make static.
	(dbxout_resume_previous_source_file): Rename dbxout_end_source_file,
	make static.
	* dbxout.h (dbxout_start_new_source_file,
	dbxout_resume_previous_source_file): Delete.
	* debug.c (do_nothing_debug_hooks): Add new hooks.
	(debug_nothing_init_finish): Rename debug_nothing_file_charstar.
	(debug_nothing_int_charstar, debug_nothing_int): New.
	* debug.h (gcc_debug_hooks): New hooks define, undef,
	start_source_file and end_source_file.
	(debug_nothing_init_finish): Rename debug_nothing_file_charstar.
	(debug_nothing_int_charstar, debug_nothing_int): New.
	* dwarf2out.c (dwarf2_debug_hooks): Add new hooks.
	(dwarf2out_start_source_file, dwarf2out_end_source_file,
	dwarf2out_define, dwarf2out_undef): Make static.
	* dwarf2out.h (dwarf2out_start_source_file, dwarf2out_end_source_file,
	dwarf2out_define, dwarf2out_undef): Remove.
	* dwarfout.c (dwarf_debug_hooks): Add new hooks.
	(dwarfout_start_source_file, dwarfout_end_source_file,
	dwarfout_define, dwarfout_undef): Make static.
	(dwarfout_start_source_file_check,
	dwarfout_end_source_file_check): New.
	(dwarfout_define, dwarfout_finish): Update.
	* dwarfout.h (dwarfout_start_new_source_file,
	dwarfout_resume_previous_source_file, dwarfout_define,
	dwarfout_undef): Remove.
	* sdbout.c (sdb_debug_hooks): Add new hooks.
	(sdbout_start_new_source_file): Rename sdbout_start_source_file,
	make static.
	(sdbout_resume_previous_source_file): Rename sdbout_end_source_file,
	make static, take an arg.
	* sdbout.h (sdbout_start_new_source_file,
	sdbout_resume_previous_source_file): Delete.
	* toplev.c (debug_start_source_file, debug_end_source_file,
	debug_define, debug_undef): Delete.
	* toplev.h (debug_start_source_file, debug_end_source_file,
	debug_define, debug_undef): Delete.

	* java/jcf-parse.c: Include debug.h.
	(parse_class_file): Update to use debug hooks directly.
	* java/Make-lang.in (jcf-parse.o): Depend on debug.h.

From-SVN: r43952

1 files changed, 27 insertions, 33 deletions

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 09a9e52..dc8d64a 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -232,8 +232,6 @@ static unsigned current_funcdef_fde;
 
 /* Forward declarations for functions defined in this file.  */
 
-static void dwarf2out_init 		PARAMS ((FILE *, const char *));
-static void dwarf2out_finish		PARAMS ((FILE *, const char *));
 static char *stripattributes		PARAMS ((const char *));
 static const char *dwarf_cfi_name	PARAMS ((unsigned));
 static dw_cfi_ref new_cfi		PARAMS ((void));
@@ -364,12 +362,6 @@ expand_builtin_dwarf_fp_regnum ()
 #define INCOMING_FRAME_SP_OFFSET 0
 #endif
 
-/* The target debug structure.  */
-
-struct gcc_debug_hooks dwarf2_debug_hooks
-  = {dwarf2out_init, dwarf2out_finish
-};
-
 /* Return a pointer to a copy of the section string name S with all
    attributes stripped off, and an asterisk prepended (for assemble_name).  */
 
@@ -3009,6 +3001,25 @@ get_cfa_from_loc_descr (cfa, loc)
 /* And now, the support for symbolic debugging information.  */
 #ifdef DWARF2_DEBUGGING_INFO
 
+static void dwarf2out_init 		PARAMS ((FILE *, const char *));
+static void dwarf2out_finish		PARAMS ((FILE *, const char *));
+static void dwarf2out_define	        PARAMS ((unsigned int, const char *));
+static void dwarf2out_undef	        PARAMS ((unsigned int, const char *));
+static void dwarf2out_start_source_file	PARAMS ((unsigned, const char *));
+static void dwarf2out_end_source_file	PARAMS ((unsigned));
+
+/* The debug hooks structure.  */
+
+struct gcc_debug_hooks dwarf2_debug_hooks =
+{
+  dwarf2out_init,
+  dwarf2out_finish,
+  dwarf2out_define,
+  dwarf2out_undef,
+  dwarf2out_start_source_file,
+  dwarf2out_end_source_file
+};
+
 /* NOTE: In the comments in this file, many references are made to
    "Debugging Information Entries".  This term is abbreviated as `DIE'
    throughout the remainder of this file.  */
@@ -11283,10 +11294,10 @@ dwarf2out_line (filename, line)
 
 /* Record the beginning of a new source file. */
 
-void
+static void
 dwarf2out_start_source_file (lineno, filename)
-     register unsigned int lineno ATTRIBUTE_UNUSED;
-     register const char *filename ATTRIBUTE_UNUSED;
+     register unsigned int lineno;
+     register const char *filename;
 {
   if (flag_eliminate_dwarf2_dups)
     {
@@ -11305,8 +11316,9 @@ dwarf2out_start_source_file (lineno, filename)
 
 /* Record the end of a source file.  */
 
-void
-dwarf2out_end_source_file ()
+static void
+dwarf2out_end_source_file (lineno)
+     unsigned int lineno ATTRIBUTE_UNUSED;
 {
   if (flag_eliminate_dwarf2_dups)
     {
@@ -11324,7 +11336,7 @@ dwarf2out_end_source_file ()
    the tail part of the directive line, i.e. the part which is past the
    initial whitespace, #, whitespace, directive-name, whitespace part.  */
 
-void
+static void
 dwarf2out_define (lineno, buffer)
      register unsigned lineno ATTRIBUTE_UNUSED;
      register const char *buffer ATTRIBUTE_UNUSED;
@@ -11348,7 +11360,7 @@ dwarf2out_define (lineno, buffer)
    the tail part of the directive line, i.e. the part which is past the
    initial whitespace, #, whitespace, directive-name, whitespace part.  */
 
-void
+static void
 dwarf2out_undef (lineno, buffer)
      register unsigned lineno ATTRIBUTE_UNUSED;
      register const char *buffer ATTRIBUTE_UNUSED;
@@ -11587,22 +11599,4 @@ dwarf2out_finish (asm_out_file, input_filename)
     }
   
 }
-#else /* DWARF2_DEBUGGING_INFO
-
-/* Use dummy versions of init and finish routines.  */
-
-static void
-dwarf2out_init (asm_out_file, main_input_filename)
-     register FILE *asm_out_file ATTRIBUTE_UNUSED;
-     register const char *main_input_filename ATTRIBUTE_UNUSED;
-{
-}
-
-static void
-dwarf2out_finish (asm_out_file, input_filename)
-     register FILE *asm_out_file ATTRIBUTE_UNUSED;
-     register const char *input_filename ATTRIBUTE_UNUSED;
-{
-}
-
 #endif /* DWARF2_DEBUGGING_INFO */