From d62fb8de7bb23385b25bd426e6349ea70923f7a5 Mon Sep 17 00:00:00 2001 From: ian Date: Mon, 20 Apr 2009 17:37:49 +0000 Subject: [PATCH] * module.c (import_iso_c_binding_module): Add casts to enum type. * trans-intrinsic.c (gfc_conv_intrinsic_minmax): Change op to enum tree_code. (gfc_conv_intrinsic_anyall): Likewise. (gfc_conv_intrinsic_arith): Likewise. (gfc_conv_intrinsic_minmaxloc): Likewise. (gfc_conv_intrinsic_minmaxval): Likewise. (gfc_conv_intrinsic_bitop): Likewise. (gfc_conv_intrinsic_singlebitop): Likewise. (gfc_conv_intrinsic_strcmp): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146445 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 13 +++++++++++++ gcc/fortran/module.c | 8 ++++++-- gcc/fortran/trans-intrinsic.c | 16 ++++++++-------- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3384aad93a2..37349b78bf7 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,16 @@ +2009-04-20 Ian Lance Taylor + + * module.c (import_iso_c_binding_module): Add casts to enum type. + * trans-intrinsic.c (gfc_conv_intrinsic_minmax): Change op to enum + tree_code. + (gfc_conv_intrinsic_anyall): Likewise. + (gfc_conv_intrinsic_arith): Likewise. + (gfc_conv_intrinsic_minmaxloc): Likewise. + (gfc_conv_intrinsic_minmaxval): Likewise. + (gfc_conv_intrinsic_bitop): Likewise. + (gfc_conv_intrinsic_singlebitop): Likewise. + (gfc_conv_intrinsic_strcmp): Likewise. + 2009-04-20 Vasilis Liaskovitis Jakub Jelinek diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index b5b79d03992..9c55c2f36ab 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -4994,7 +4994,9 @@ import_iso_c_binding_module (void) continue; } - generate_isocbinding_symbol (iso_c_module_name, i, u->local_name); + generate_isocbinding_symbol (iso_c_module_name, + (iso_c_binding_symbol) i, + u->local_name); } } else @@ -5011,7 +5013,9 @@ import_iso_c_binding_module (void) break; } } - generate_isocbinding_symbol (iso_c_module_name, i, local_name); + generate_isocbinding_symbol (iso_c_module_name, + (iso_c_binding_symbol) i, + local_name); } for (u = gfc_rename_list; u; u = u->next) diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index a8ac42ea74f..47960e90bbd 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -1489,7 +1489,7 @@ gfc_conv_intrinsic_ttynam (gfc_se * se, gfc_expr * expr) /* TODO: Mismatching types can occur when specific names are used. These should be handled during resolution. */ static void -gfc_conv_intrinsic_minmax (gfc_se * se, gfc_expr * expr, int op) +gfc_conv_intrinsic_minmax (gfc_se * se, gfc_expr * expr, enum tree_code op) { tree tmp; tree mvar; @@ -1725,7 +1725,7 @@ gfc_conv_intrinsic_funcall (gfc_se * se, gfc_expr * expr) } */ static void -gfc_conv_intrinsic_anyall (gfc_se * se, gfc_expr * expr, int op) +gfc_conv_intrinsic_anyall (gfc_se * se, gfc_expr * expr, enum tree_code op) { tree resvar; stmtblock_t block; @@ -1880,7 +1880,7 @@ gfc_conv_intrinsic_count (gfc_se * se, gfc_expr * expr) /* Inline implementation of the sum and product intrinsics. */ static void -gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, int op) +gfc_conv_intrinsic_arith (gfc_se * se, gfc_expr * expr, enum tree_code op) { tree resvar; tree type; @@ -2107,7 +2107,7 @@ gfc_conv_intrinsic_dot_product (gfc_se * se, gfc_expr * expr) static void -gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) +gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, enum tree_code op) { stmtblock_t body; stmtblock_t block; @@ -2312,7 +2312,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) } static void -gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, int op) +gfc_conv_intrinsic_minmaxval (gfc_se * se, gfc_expr * expr, enum tree_code op) { tree limit; tree type; @@ -2484,7 +2484,7 @@ gfc_conv_intrinsic_btest (gfc_se * se, gfc_expr * expr) /* Generate code to perform the specified operation. */ static void -gfc_conv_intrinsic_bitop (gfc_se * se, gfc_expr * expr, int op) +gfc_conv_intrinsic_bitop (gfc_se * se, gfc_expr * expr, enum tree_code op) { tree args[2]; @@ -2509,7 +2509,7 @@ gfc_conv_intrinsic_singlebitop (gfc_se * se, gfc_expr * expr, int set) tree args[2]; tree type; tree tmp; - int op; + enum tree_code op; gfc_conv_intrinsic_function_args (se, expr, args, 2); type = TREE_TYPE (args[0]); @@ -3584,7 +3584,7 @@ gfc_conv_intrinsic_sizeof (gfc_se *se, gfc_expr *expr) /* Intrinsic string comparison functions. */ static void -gfc_conv_intrinsic_strcmp (gfc_se * se, gfc_expr * expr, int op) +gfc_conv_intrinsic_strcmp (gfc_se * se, gfc_expr * expr, enum tree_code op) { tree args[4]; -- 2.11.4.GIT