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/ada/ChangeLog | 6 ++++++ gcc/ada/misc.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'gcc/ada') diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 4a47514..03f7477 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,11 @@ 2002-03-27 Neil Booth + * misc.c (LANG_HOOKS_EXPAND_EXPR): Redefine. + (gnat_init): Don't set hook. + (gnat_expand_expr): Fix prototype. + +2002-03-27 Neil Booth + * misc.c (ggc_p): Remove. 2002-03-27 Geert Bosch diff --git a/gcc/ada/misc.c b/gcc/ada/misc.c index bcd9dee..5a2c68a 100644 --- a/gcc/ada/misc.c +++ b/gcc/ada/misc.c @@ -108,6 +108,8 @@ static void gnat_mark_tree PARAMS ((tree)); #define LANG_HOOKS_HONOR_READONLY 1 #undef LANG_HOOKS_GET_ALIAS_SET #define LANG_HOOKS_GET_ALIAS_SET gnat_get_alias_set +#undef LANG_HOOKS_EXPAND_EXPR +#define LANG_HOOKS_EXPAND_EXPR gnat_expand_expr #undef LANG_HOOKS_PRINT_DECL #define LANG_HOOKS_PRINT_DECL gnat_print_decl #undef LANG_HOOKS_PRINT_TYPE @@ -163,7 +165,7 @@ extern char **gnat_argv; static void internal_error_function PARAMS ((const char *, va_list *)); static rtx gnat_expand_expr PARAMS ((tree, rtx, enum machine_mode, - enum expand_modifier)); + int)); static void gnat_adjust_rli PARAMS ((record_layout_info)); /* Declare functions we use as part of startup. */ @@ -358,8 +360,6 @@ gnat_init (filename) Define the additional tree codes here. This isn't the best place to put it, but it's where g++ does it. */ - lang_expand_expr = gnat_expand_expr; - gnat_init_decl_processing (); /* Add the input filename as the last argument. */ @@ -503,7 +503,7 @@ gnat_expand_expr (exp, target, tmode, modifier) tree exp; rtx target; enum machine_mode tmode; - enum expand_modifier modifier; + int modifier; /* Actually an enum expand_modifier. */ { tree type = TREE_TYPE (exp); tree new; -- cgit v1.1