From c9d892a83fc5ef512d01237b12c8b6c7dc3acdae Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Wed, 27 Mar 2002 18:28:06 +0000 Subject: c-common.c (c_expand_expr): Fix prototype. * c-common.c (c_expand_expr): Fix prototype. * c-common.h (c_expand_expr): Always declare, update. * c-lang.c (LANG_HOOKS_EXPAND_EXPR): Redefine. * c-objc-common.c (c_objc_common_init): No global hook. * expr.c (expand_expr): Use langhook. * expr.h (enum expand_modifier): Conditionally declare. * langhooks-def.h (lhd_expand_expr, LANG_HOOKS_EXPAND_EXPR): New. (LANG_HOOKS_INITIALIZER): Update. * langhooks.c (lhd_expand_expr): New. * langhooks.h (struct lang_hooks): New hook. * toplev.c (lang_expand_expr_t, lang_expand_expr): Delete. (lang_independent_init): Don't default hook. ada: * misc.c (LANG_HOOKS_EXPAND_EXPR): Redefine. (gnat_init): Don't set hook. (gnat_expand_expr): Fix prototype. cp: * cp-lang.c (LANG_HOOKS_EXPAND_EXPR): Redefine. * cp-tree.h (init_cplus_expand): Remove. (cxx_expand_expr): New. * expr.c (cplus_expand_expr): Rename cxx_expand_expr, fix prototype. (init_cplus_expand): Remove. * lex.c (cxx_init): Don't call init_cplus_expand. java: * expr.c (java_lang_expand_expr): Rename java_expand_expr, fix prototype. * java-tree.h (java_lang_expand_expr): Similarly. * lang.c (LANG_HOOKS_EXPAND_EXPR): Redefine. (java_init): Don't set hook. objc: * objc-lang.c (LANG_HOOKS_EXPAND_EXPR): Redefine. From-SVN: r51462 --- gcc/java/ChangeLog | 8 ++++++++ gcc/java/expr.c | 4 ++-- gcc/java/java-tree.h | 10 ++++------ gcc/java/lang.c | 3 ++- 4 files changed, 16 insertions(+), 9 deletions(-) (limited to 'gcc/java') diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 8fc8e7b..58cf198 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2002-03-27 Neil Booth + + * expr.c (java_lang_expand_expr): Rename java_expand_expr, + fix prototype. + * java-tree.h (java_lang_expand_expr): Similarly. + * lang.c (LANG_HOOKS_EXPAND_EXPR): Redefine. + (java_init): Don't set hook. + 2002-03-27 Bryce McKinlay Fix for PR java/5850: diff --git a/gcc/java/expr.c b/gcc/java/expr.c index a1ec332..a251404 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -2480,11 +2480,11 @@ get_primitive_array_vtable (tree elt) } struct rtx_def * -java_lang_expand_expr (exp, target, tmode, modifier) +java_expand_expr (exp, target, tmode, modifier) register tree exp; rtx target; enum machine_mode tmode; - enum expand_modifier modifier; + int modifier; /* Actually an enum expand_modifier. */ { tree current; diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index de7b102..cf272fd 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -1247,12 +1247,10 @@ extern void append_gpp_mangled_name PARAMS ((const char *, int)); extern void add_predefined_file PARAMS ((tree)); extern int predefined_filename_p PARAMS ((tree)); -/* We use ARGS_SIZE_RTX to indicate that gcc/expr.h has been included - to declare `enum expand_modifier'. */ -#if defined (TREE_CODE) && defined(RTX_CODE) && defined (HAVE_MACHINE_MODES) && defined (ARGS_SIZE_RTX) -struct rtx_def * java_lang_expand_expr PARAMS ((tree, rtx, enum machine_mode, - enum expand_modifier)); -#endif /* TREE_CODE && RTX_CODE && HAVE_MACHINE_MODES && ARGS_SIZE_RTX */ +#if defined(RTX_CODE) && defined (HAVE_MACHINE_MODES) +struct rtx_def * java_expand_expr PARAMS ((tree, rtx, enum machine_mode, + int)); +#endif #define DECL_FINAL(DECL) DECL_LANG_FLAG_3 (DECL) diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 99a5e20..56f1619 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_MARK_TREE #define LANG_HOOKS_MARK_TREE java_mark_tree +#undef LANG_HOOKS_EXPAND_EXPR +#define LANG_HOOKS_EXPAND_EXPR java_expand_expr #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 @@ -511,7 +513,6 @@ java_init (filename) jcf_path_seal (version_flag); print_error_function = lang_print_error; - lang_expand_expr = java_lang_expand_expr; java_init_decl_processing (); -- cgit v1.1