From 7afff7cfb08e971723fee6a6b4ed508a3fdf9c26 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 20 Mar 2002 07:58:41 +0000 Subject: Makefile.in: Update. * Makefile.in: Update. * c-common.c: Include langhooks.h. (inline_forbidden_p): Use new hook. * diagnostic.c: Include langhooks.h. (format_with_decl, announce_function, default_print_error_function): Use new hook. * dwarf2out.c (dwarf2_name): Use new hook. * function.c: Include langhooks.h. (init_function_start): Use new hook. * langhooks-def.h (lhd_decl_printable_name): New. (LANGHOOKS_DECL_PRINTABLE_NAME): New. (LANGHOOKS_INITIALIZER): Update. * langhooks.c (lhd_decl_printable_name): New. * langhooks.h (struct lang_hooks): New hook. * toplev.c (decl_name, decl_printable_name): Remove. (open_dump_file): Use new hook. (process_options): Remove old hook. * tree.h (decl_printable_name): Remove. ada: * misc.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine. (gnat_init): Remove old hook. cp: * cp-lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine. * cp-tree.h (lang_printable_name): Rename. * error.c (lang_decl_name): Use new hook. * lex.c (cxx_init): Remove old hook. * pt.c (tsubst_expr): Use new hook. * tree.c (lang_printable_name): Rename. f: * com.c (lang_printable_name): Rename. (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine. (ffe_init): Don't use old hook. java: * decl.c (start_java_method): Use new hook. * lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine. (java_init): Remove old hook. objc: * objc-act.c (objc_init): Remove old hook. (objc_printable_name): Export. * objc-act.h (objc_printable_name): New. * objc-lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine. From-SVN: r51066 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/decl.c | 2 +- gcc/java/lang.c | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index efdbde5..dc59c83 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2002-03-20 Neil Booth + + * decl.c (start_java_method): Use new hook. + * lang.c (LANG_HOOKS_DECL_PRINTABLE_NAME): Redefine. + (java_init): Remove old hook. + 2002-03-18 Alexandre Petit-Bianco * builtins.c (define_builtin): Do nothing if `type' is null. diff --git a/gcc/java/decl.c b/gcc/java/decl.c index ddba14f..ffcccb2 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -1775,7 +1775,7 @@ start_java_method (fndecl) type_map = (tree *) xrealloc (type_map, i * sizeof (tree)); #if defined(DEBUG_JAVA_BINDING_LEVELS) - fprintf (stderr, "%s:\n", (*decl_printable_name) (fndecl, 2)); + fprintf (stderr, "%s:\n", lang_printable_name (fndecl, 2)); current_pc = 0; #endif /* defined(DEBUG_JAVA_BINDING_LEVELS) */ pushlevel (1); /* Push parameters. */ diff --git a/gcc/java/lang.c b/gcc/java/lang.c index d9e5847..c612b491 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -225,6 +225,8 @@ static int dependency_tracking = 0; #define LANG_HOOKS_PARSE_FILE java_parse_file #undef LANG_HOOKS_DUP_LANG_SPECIFIC_DECL #define LANG_HOOKS_DUP_LANG_SPECIFIC_DECL java_dup_lang_specific_decl +#undef LANG_HOOKS_DECL_PRINTABLE_NAME +#define LANG_HOOKS_DECL_PRINTABLE_NAME lang_printable_name /* Each front end provides its own. */ const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; @@ -506,7 +508,6 @@ java_init (filename) jcf_path_init (); jcf_path_seal (version_flag); - decl_printable_name = lang_printable_name; print_error_function = lang_print_error; lang_expand_expr = java_lang_expand_expr; -- cgit v1.1