diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/expr.c | 4 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 10 | ||||
| -rw-r--r-- | gcc/java/lang.c | 3 |
4 files changed, 16 insertions, 9 deletions
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 <neil@daikokuya.demon.co.uk> + + * 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 <bryce@waitaki.otago.ac.nz> 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 (); |