From 3c260e1d978952822869eac25f9ded0a82d75563 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Fri, 1 Aug 2003 02:11:17 +0000 Subject: [PATCH] builtin-types.def: Use `LONGDOUBLE' instead of `LONG_DOUBLE' throughout. * builtin-types.def: Use `LONGDOUBLE' instead of `LONG_DOUBLE' throughout. * builtins.def: Likewise. From-SVN: r70034 --- gcc/ChangeLog | 6 ++++++ gcc/builtin-types.def | 29 ++++++++++++++++------------- gcc/builtins.def | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 46 insertions(+), 37 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a4b2a02..ae5cceb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-07-31 Kaveh R. Ghazi + + * builtin-types.def: Use `LONGDOUBLE' instead of `LONG_DOUBLE' + throughout. + * builtins.def: Likewise. + 2003-07-31 Jason Merrill * Makefile.in (bubblestrap): Don't require a previous full diff --git a/gcc/builtin-types.def b/gcc/builtin-types.def index d9b98f1..f5d90c3 100644 --- a/gcc/builtin-types.def +++ b/gcc/builtin-types.def @@ -67,10 +67,10 @@ DEF_PRIMITIVE_TYPE (BT_LONGLONG, long_long_integer_type_node) DEF_PRIMITIVE_TYPE (BT_FLOAT, float_type_node) DEF_PRIMITIVE_TYPE (BT_INTMAX, intmax_type_node) DEF_PRIMITIVE_TYPE (BT_DOUBLE, double_type_node) -DEF_PRIMITIVE_TYPE (BT_LONG_DOUBLE, long_double_type_node) +DEF_PRIMITIVE_TYPE (BT_LONGDOUBLE, long_double_type_node) DEF_PRIMITIVE_TYPE (BT_COMPLEX_FLOAT, complex_float_type_node) DEF_PRIMITIVE_TYPE (BT_COMPLEX_DOUBLE, complex_double_type_node) -DEF_PRIMITIVE_TYPE (BT_COMPLEX_LONG_DOUBLE, complex_long_double_type_node) +DEF_PRIMITIVE_TYPE (BT_COMPLEX_LONGDOUBLE, complex_long_double_type_node) DEF_PRIMITIVE_TYPE (BT_PTR, ptr_type_node) DEF_PRIMITIVE_TYPE (BT_CONST_PTR, const_ptr_type_node) @@ -87,27 +87,30 @@ DEF_FUNCTION_TYPE_0 (BT_FN_PTR, BT_PTR) DEF_FUNCTION_TYPE_0 (BT_FN_UNSIGNED, BT_UNSIGNED) DEF_FUNCTION_TYPE_0 (BT_FN_FLOAT, BT_FLOAT) DEF_FUNCTION_TYPE_0 (BT_FN_DOUBLE, BT_DOUBLE) -DEF_FUNCTION_TYPE_0 (BT_FN_LONG_DOUBLE, BT_LONG_DOUBLE) +/* For "long double" we use LONGDOUBLE (not LONG_DOUBLE) to + distinguish it from two types in sequence, "long" followed by + "double". */ +DEF_FUNCTION_TYPE_0 (BT_FN_LONGDOUBLE, BT_LONGDOUBLE) DEF_FUNCTION_TYPE_1 (BT_FN_LONG_LONG, BT_LONG, BT_LONG) DEF_FUNCTION_TYPE_1 (BT_FN_LONGLONG_LONGLONG, BT_LONGLONG, BT_LONGLONG) DEF_FUNCTION_TYPE_1 (BT_FN_INTMAX_INTMAX, BT_INTMAX, BT_INTMAX) DEF_FUNCTION_TYPE_1 (BT_FN_FLOAT_FLOAT, BT_FLOAT, BT_FLOAT) DEF_FUNCTION_TYPE_1 (BT_FN_DOUBLE_DOUBLE, BT_DOUBLE, BT_DOUBLE) -DEF_FUNCTION_TYPE_1 (BT_FN_LONG_DOUBLE_LONG_DOUBLE, - BT_LONG_DOUBLE, BT_LONG_DOUBLE) +DEF_FUNCTION_TYPE_1 (BT_FN_LONGDOUBLE_LONGDOUBLE, + BT_LONGDOUBLE, BT_LONGDOUBLE) DEF_FUNCTION_TYPE_1 (BT_FN_COMPLEX_FLOAT_COMPLEX_FLOAT, BT_COMPLEX_FLOAT, BT_COMPLEX_FLOAT) DEF_FUNCTION_TYPE_1 (BT_FN_COMPLEX_DOUBLE_COMPLEX_DOUBLE, BT_COMPLEX_DOUBLE, BT_COMPLEX_DOUBLE) -DEF_FUNCTION_TYPE_1 (BT_FN_COMPLEX_LONG_DOUBLE_COMPLEX_LONG_DOUBLE, - BT_COMPLEX_LONG_DOUBLE, BT_COMPLEX_LONG_DOUBLE) +DEF_FUNCTION_TYPE_1 (BT_FN_COMPLEX_LONGDOUBLE_COMPLEX_LONGDOUBLE, + BT_COMPLEX_LONGDOUBLE, BT_COMPLEX_LONGDOUBLE) DEF_FUNCTION_TYPE_1 (BT_FN_FLOAT_COMPLEX_FLOAT, BT_FLOAT, BT_COMPLEX_FLOAT) DEF_FUNCTION_TYPE_1 (BT_FN_DOUBLE_COMPLEX_DOUBLE, BT_DOUBLE, BT_COMPLEX_DOUBLE) -DEF_FUNCTION_TYPE_1 (BT_FN_LONG_DOUBLE_COMPLEX_LONG_DOUBLE, - BT_LONG_DOUBLE, BT_COMPLEX_LONG_DOUBLE) +DEF_FUNCTION_TYPE_1 (BT_FN_LONGDOUBLE_COMPLEX_LONGDOUBLE, + BT_LONGDOUBLE, BT_COMPLEX_LONGDOUBLE) DEF_FUNCTION_TYPE_1 (BT_FN_PTR_UNSIGNED, BT_PTR, BT_UNSIGNED) DEF_FUNCTION_TYPE_1 (BT_FN_PTR_SIZE, BT_PTR, BT_SIZE) DEF_FUNCTION_TYPE_1 (BT_FN_INT_INT, BT_INT, BT_INT) @@ -122,8 +125,8 @@ DEF_FUNCTION_TYPE_1 (BT_FN_VOID_VALIST_REF, BT_VOID, BT_VALIST_REF) DEF_FUNCTION_TYPE_1 (BT_FN_VOID_INT, BT_VOID, BT_INT) DEF_FUNCTION_TYPE_1 (BT_FN_FLOAT_CONST_STRING, BT_FLOAT, BT_CONST_STRING) DEF_FUNCTION_TYPE_1 (BT_FN_DOUBLE_CONST_STRING, BT_DOUBLE, BT_CONST_STRING) -DEF_FUNCTION_TYPE_1 (BT_FN_LONG_DOUBLE_CONST_STRING, - BT_LONG_DOUBLE, BT_CONST_STRING) +DEF_FUNCTION_TYPE_1 (BT_FN_LONGDOUBLE_CONST_STRING, + BT_LONGDOUBLE, BT_CONST_STRING) DEF_FUNCTION_TYPE_1 (BT_FN_STRING_CONST_STRING, BT_STRING, BT_CONST_STRING) DEF_FUNCTION_TYPE_2 (BT_FN_VOID_PTR_INT, BT_VOID, BT_PTR, BT_INT) @@ -155,8 +158,8 @@ DEF_FUNCTION_TYPE_2 (BT_FN_FLOAT_FLOAT_FLOAT, BT_FLOAT, BT_FLOAT, BT_FLOAT) DEF_FUNCTION_TYPE_2 (BT_FN_DOUBLE_DOUBLE_DOUBLE, BT_DOUBLE, BT_DOUBLE, BT_DOUBLE) -DEF_FUNCTION_TYPE_2 (BT_FN_LONG_DOUBLE_LONG_DOUBLE_LONG_DOUBLE, - BT_LONG_DOUBLE, BT_LONG_DOUBLE, BT_LONG_DOUBLE) +DEF_FUNCTION_TYPE_2 (BT_FN_LONGDOUBLE_LONGDOUBLE_LONGDOUBLE, + BT_LONGDOUBLE, BT_LONGDOUBLE, BT_LONGDOUBLE) DEF_FUNCTION_TYPE_2 (BT_FN_INT_CONST_STRING_VALIST_ARG, BT_INT, BT_CONST_STRING, BT_VALIST_ARG) DEF_FUNCTION_TYPE_2 (BT_FN_PTR_SIZE_SIZE, diff --git a/gcc/builtins.def b/gcc/builtins.def index 0807450..7120246 100644 --- a/gcc/builtins.def +++ b/gcc/builtins.def @@ -155,7 +155,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_ATANF, DEF_C99_C90RES_BUILTIN(BUILT_IN_ATANL, "__builtin_atanl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST : ATTR_PURE_NOTHROW_LIST) @@ -177,7 +177,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_ATAN2F, DEF_C99_C90RES_BUILTIN(BUILT_IN_ATAN2L, "__builtin_atan2l", - BT_FN_LONG_DOUBLE_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE_LONGDOUBLE, flag_errno_math ? ATTR_NOTHROW_LIST : (flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST @@ -216,7 +216,7 @@ DEF_C99_BUILTIN(BUILT_IN_CABSF, DEF_C99_BUILTIN(BUILT_IN_CABSL, "__builtin_cabsl", - BT_FN_LONG_DOUBLE_COMPLEX_LONG_DOUBLE, + BT_FN_LONGDOUBLE_COMPLEX_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_LIB_BUILTIN(BUILT_IN_CALLOC, @@ -236,7 +236,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_CEILF, DEF_C99_C90RES_BUILTIN(BUILT_IN_CEILL, "__builtin_ceill", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_C99_BUILTIN(BUILT_IN_CIMAG, @@ -251,7 +251,7 @@ DEF_C99_BUILTIN(BUILT_IN_CIMAGF, DEF_C99_BUILTIN(BUILT_IN_CIMAGL, "__builtin_cimagl", - BT_FN_LONG_DOUBLE_COMPLEX_LONG_DOUBLE, + BT_FN_LONGDOUBLE_COMPLEX_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_GCC_BUILTIN(BUILT_IN_CLASSIFY_TYPE, @@ -286,7 +286,7 @@ DEF_C99_BUILTIN(BUILT_IN_CONJF, DEF_C99_BUILTIN(BUILT_IN_CONJL, "__builtin_conjl", - BT_FN_COMPLEX_LONG_DOUBLE_COMPLEX_LONG_DOUBLE, + BT_FN_COMPLEX_LONGDOUBLE_COMPLEX_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_GCC_BUILTIN(BUILT_IN_CONSTANT_P, @@ -308,7 +308,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_COSF, DEF_C99_C90RES_BUILTIN(BUILT_IN_COSL, "__builtin_cosl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST : ATTR_PURE_NOTHROW_LIST) @@ -324,7 +324,7 @@ DEF_C99_BUILTIN(BUILT_IN_CREALF, DEF_C99_BUILTIN(BUILT_IN_CREALL, "__builtin_creall", - BT_FN_LONG_DOUBLE_COMPLEX_LONG_DOUBLE, + BT_FN_LONGDOUBLE_COMPLEX_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_GCC_BUILTIN(BUILT_IN_CTZ, @@ -395,7 +395,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_EXPF, DEF_C99_C90RES_BUILTIN(BUILT_IN_EXPL, "__builtin_expl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, flag_errno_math ? ATTR_NOTHROW_LIST : (flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST @@ -423,7 +423,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_FABSF, DEF_C99_C90RES_BUILTIN(BUILT_IN_FABSL, "__builtin_fabsl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_EXT_LIB_BUILTIN(BUILT_IN_FFS, @@ -453,7 +453,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_FLOORF, DEF_C99_C90RES_BUILTIN(BUILT_IN_FLOORL, "__builtin_floorl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_LIB_BUILTIN(BUILT_IN_FMOD, @@ -474,7 +474,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_FMODF, DEF_C99_C90RES_BUILTIN(BUILT_IN_FMODL, "__builtin_fmodl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE_LONGDOUBLE, flag_errno_math ? ATTR_NOTHROW_LIST : (flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST @@ -542,7 +542,7 @@ DEF_GCC_BUILTIN(BUILT_IN_HUGE_VALF, DEF_GCC_BUILTIN(BUILT_IN_HUGE_VALL, "__builtin_huge_vall", - BT_FN_LONG_DOUBLE, + BT_FN_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_C99_BUILTIN(BUILT_IN_IMAXABS, @@ -567,7 +567,7 @@ DEF_GCC_BUILTIN(BUILT_IN_INFF, DEF_GCC_BUILTIN(BUILT_IN_INFL, "__builtin_infl", - BT_FN_LONG_DOUBLE, + BT_FN_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_GCC_BUILTIN(BUILT_IN_INIT_DWARF_REG_SIZES, @@ -633,7 +633,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_LOGF, DEF_C99_C90RES_BUILTIN(BUILT_IN_LOGL, "__builtin_logl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, flag_errno_math ? ATTR_NOTHROW_LIST : (flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST @@ -686,7 +686,7 @@ DEF_LIB_BUILTIN(BUILT_IN_NANF, DEF_LIB_BUILTIN(BUILT_IN_NANL, "__builtin_nanl", - BT_FN_LONG_DOUBLE_CONST_STRING, + BT_FN_LONGDOUBLE_CONST_STRING, ATTR_CONST_NOTHROW_NONNULL_1) DEF_LIB_BUILTIN(BUILT_IN_NANS, @@ -701,7 +701,7 @@ DEF_LIB_BUILTIN(BUILT_IN_NANSF, DEF_LIB_BUILTIN(BUILT_IN_NANSL, "__builtin_nansl", - BT_FN_LONG_DOUBLE_CONST_STRING, + BT_FN_LONGDOUBLE_CONST_STRING, ATTR_CONST_NOTHROW_NONNULL_1) DEF_C99_BUILTIN(BUILT_IN_NEARBYINT, @@ -716,7 +716,7 @@ DEF_C99_BUILTIN(BUILT_IN_NEARBYINTF, DEF_C99_BUILTIN(BUILT_IN_NEARBYINTL, "__builtin_nearbyintl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_GCC_BUILTIN(BUILT_IN_NEXT_ARG, @@ -772,7 +772,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_POWF, DEF_C99_C90RES_BUILTIN(BUILT_IN_POWL, "__builtin_powl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE_LONGDOUBLE, flag_errno_math ? ATTR_NOTHROW_LIST : (flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST @@ -840,7 +840,7 @@ DEF_C99_BUILTIN(BUILT_IN_ROUNDF, DEF_C99_BUILTIN(BUILT_IN_ROUNDL, "__builtin_roundl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_GCC_BUILTIN(BUILT_IN_SAVEREGS, @@ -872,7 +872,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_SINF, DEF_C99_C90RES_BUILTIN(BUILT_IN_SINL, "__builtin_sinl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST : ATTR_PURE_NOTHROW_LIST) @@ -989,7 +989,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_SQRTF, DEF_C99_C90RES_BUILTIN(BUILT_IN_SQRTL, "__builtin_sqrtl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, flag_errno_math ? ATTR_NOTHROW_LIST : (flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST @@ -1009,7 +1009,7 @@ DEF_C99_C90RES_BUILTIN(BUILT_IN_TANF, DEF_C99_C90RES_BUILTIN(BUILT_IN_TANL, "__builtin_tanl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, flag_unsafe_math_optimizations ? ATTR_CONST_NOTHROW_LIST : ATTR_PURE_NOTHROW_LIST) @@ -1030,7 +1030,7 @@ DEF_C99_BUILTIN(BUILT_IN_TRUNCF, DEF_C99_BUILTIN(BUILT_IN_TRUNCL, "__builtin_truncl", - BT_FN_LONG_DOUBLE_LONG_DOUBLE, + BT_FN_LONGDOUBLE_LONGDOUBLE, ATTR_CONST_NOTHROW_LIST) DEF_GCC_BUILTIN(BUILT_IN_UNWIND_INIT, -- 2.7.4