From fa83660d5698416ab6c66d31d6e23ed614b9895d Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 30 Sep 2015 17:14:29 +0200 Subject: [PATCH] More DEF_FUNCTION_TYPE_VAR_6/DEF_FUNCTION_TYPE_VAR_11 cleanup gcc/ada/ * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_11): Don't define. gcc/jit/ * jit-builtins.h: Undefine DEF_FUNCTION_TYPE_VAR_6 after use. Co-Authored-By: Ulrich Drepper From-SVN: r228298 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/gcc-interface/utils.c | 8 -------- gcc/jit/ChangeLog | 5 +++++ gcc/jit/jit-builtins.h | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index efb2d3a93b2..d4c505c3fc5 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2015-09-30 Thomas Schwinge + + * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_11): Don't define. + 2015-09-28 Tom de Vries * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_6): Define diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index 672b910b26f..0f3087d3dbf 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -5380,8 +5380,6 @@ enum c_builtin_type ARG6) NAME, #define DEF_FUNCTION_TYPE_VAR_7(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7) NAME, -#define DEF_FUNCTION_TYPE_VAR_11(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE @@ -5402,7 +5400,6 @@ enum c_builtin_type #undef DEF_FUNCTION_TYPE_VAR_5 #undef DEF_FUNCTION_TYPE_VAR_6 #undef DEF_FUNCTION_TYPE_VAR_7 -#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE BT_LAST }; @@ -5514,10 +5511,6 @@ install_builtin_function_types (void) #define DEF_FUNCTION_TYPE_VAR_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7) \ def_fn_type (ENUM, RETURN, 1, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7); -#define DEF_FUNCTION_TYPE_VAR_11(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) \ - def_fn_type (ENUM, RETURN, 1, 11, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \ - ARG7, ARG8, ARG9, ARG10, ARG11); #define DEF_POINTER_TYPE(ENUM, TYPE) \ builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]); @@ -5541,7 +5534,6 @@ install_builtin_function_types (void) #undef DEF_FUNCTION_TYPE_VAR_5 #undef DEF_FUNCTION_TYPE_VAR_6 #undef DEF_FUNCTION_TYPE_VAR_7 -#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE builtin_types[(int) BT_LAST] = NULL_TREE; } diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index faa854512d2..05fa9e6afe9 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,3 +1,8 @@ +2015-09-30 Thomas Schwinge + Ulrich Drepper + + * jit-builtins.h: Undefine DEF_FUNCTION_TYPE_VAR_6 after use. + 2015-09-30 Matthias Klose * jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6, diff --git a/gcc/jit/jit-builtins.h b/gcc/jit/jit-builtins.h index 0b6f9744192..3d762476acc 100644 --- a/gcc/jit/jit-builtins.h +++ b/gcc/jit/jit-builtins.h @@ -72,6 +72,7 @@ enum jit_builtin_type #undef DEF_FUNCTION_TYPE_VAR_3 #undef DEF_FUNCTION_TYPE_VAR_4 #undef DEF_FUNCTION_TYPE_VAR_5 +#undef DEF_FUNCTION_TYPE_VAR_6 #undef DEF_FUNCTION_TYPE_VAR_7 #undef DEF_POINTER_TYPE BT_LAST -- 2.30.2