From a4437d18b92884c401e0a21ffdef0b8398201b4b Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 5 Apr 2011 14:25:32 +0000 Subject: [PATCH] trans-intrinsic.c (gfc_build_intrinsic_lib_fndecls): Use build_function_type_list instead of build_function_type. * trans-intrinsic.c (gfc_build_intrinsic_lib_fndecls): Use build_function_type_list instead of build_function_type. Correct argument order for func_frexp and func_scalbn. From-SVN: r171987 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-intrinsic.c | 37 +++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 5d3a799075e..0206ba9430a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-04-05 Nathan Froyd + + * trans-intrinsic.c (gfc_build_intrinsic_lib_fndecls): Use + build_function_type_list instead of build_function_type. Correct + argument order for func_frexp and func_scalbn. + 2011-04-05 Duncan Sands * f95-lang.c (build_builtin_fntypes): Swap frexp parameter types. diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index a3c2ecda0c6..9a696322d9c 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -621,35 +621,38 @@ gfc_build_intrinsic_lib_fndecls (void) C99-like library functions. For now, we only handle __float128 q-suffixed functions. */ - tree tmp, func_1, func_2, func_cabs, func_frexp; + tree type, complex_type, func_1, func_2, func_cabs, func_frexp; tree func_lround, func_llround, func_scalbn, func_cpow; memset (quad_decls, 0, sizeof(tree) * (END_BUILTINS + 1)); + type = float128_type_node; + complex_type = complex_float128_type_node; /* type (*) (type) */ - tmp = tree_cons (NULL_TREE, float128_type_node, void_list_node); - func_1 = build_function_type (float128_type_node, tmp); + func_1 = build_function_type_list (type, type, NULL_TREE); /* long (*) (type) */ - func_lround = build_function_type (long_integer_type_node, tmp); + func_lround = build_function_type_list (long_integer_type_node, + type, NULL_TREE); /* long long (*) (type) */ - func_llround = build_function_type (long_long_integer_type_node, tmp); + func_llround = build_function_type_list (long_long_integer_type_node, + type, NULL_TREE); /* type (*) (type, type) */ - tmp = tree_cons (NULL_TREE, float128_type_node, tmp); - func_2 = build_function_type (float128_type_node, tmp); + func_2 = build_function_type_list (type, type, type, NULL_TREE); /* type (*) (type, &int) */ - tmp = tree_cons (NULL_TREE, float128_type_node, void_list_node); - tmp = tree_cons (NULL_TREE, build_pointer_type (integer_type_node), tmp); - func_frexp = build_function_type (float128_type_node, tmp); + func_frexp + = build_function_type_list (type, + type, + build_pointer_type (integer_type_node), + NULL_TREE); /* type (*) (type, int) */ - tmp = tree_cons (NULL_TREE, float128_type_node, void_list_node); - tmp = tree_cons (NULL_TREE, integer_type_node, tmp); - func_scalbn = build_function_type (float128_type_node, tmp); + func_scalbn = build_function_type_list (type, + type, integer_type_node, NULL_TREE); /* type (*) (complex type) */ - tmp = tree_cons (NULL_TREE, complex_float128_type_node, void_list_node); - func_cabs = build_function_type (float128_type_node, tmp); + func_cabs = build_function_type_list (type, complex_type, NULL_TREE); /* complex type (*) (complex type, complex type) */ - tmp = tree_cons (NULL_TREE, complex_float128_type_node, tmp); - func_cpow = build_function_type (complex_float128_type_node, tmp); + func_cpow + = build_function_type_list (complex_type, + complex_type, complex_type, NULL_TREE); #define DEFINE_MATH_BUILTIN(ID, NAME, ARGTYPE) #define DEFINE_MATH_BUILTIN_C(ID, NAME, ARGTYPE) -- 2.30.2