From 20a44562a630bf59b9d3123cf4dc753634d9a8fa Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 30 Sep 2015 12:42:44 +0000 Subject: [PATCH] 2015-09-30 Matthias Klose * jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6, remove DEF_FUNCTION_TYPE_VAR_11. * jit-builtins.c (builtins_manager::make_type): Define and handle DEF_FUNCTION_TYPE_VAR_6, remove DEF_FUNCTION_TYPE_VAR_11. From-SVN: r228289 --- gcc/jit/ChangeLog | 7 +++++++ gcc/jit/jit-builtins.c | 11 +++++------ gcc/jit/jit-builtins.h | 5 ++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index fae643686f7..faa854512d2 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,3 +1,10 @@ +2015-09-30 Matthias Klose + + * jit-builtins.h Define DEF_FUNCTION_TYPE_VAR_6, + remove DEF_FUNCTION_TYPE_VAR_11. + * jit-builtins.c (builtins_manager::make_type): Define and handle + DEF_FUNCTION_TYPE_VAR_6, remove DEF_FUNCTION_TYPE_VAR_11. + 2015-08-25 David Malcolm * docs/cp/topics/contexts.rst diff --git a/gcc/jit/jit-builtins.c b/gcc/jit/jit-builtins.c index a29f446fe7c..4ef80edc452 100644 --- a/gcc/jit/jit-builtins.c +++ b/gcc/jit/jit-builtins.c @@ -320,15 +320,14 @@ builtins_manager::make_type (enum jit_builtin_type type_id) #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ case ENUM: return make_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, \ ARG4, ARG5); +#define DEF_FUNCTION_TYPE_VAR_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6) \ + case ENUM: return make_fn_type (ENUM, RETURN, 1, 6, ARG1, ARG2, ARG3, \ + ARG4, ARG5, ARG6); #define DEF_FUNCTION_TYPE_VAR_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7) \ case ENUM: return make_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) \ - case ENUM: return make_fn_type (ENUM, RETURN, 1, 11, ARG1, ARG2, ARG3, \ - ARG4, ARG5, ARG6, ARG7, ARG8, ARG9, \ - ARG10, ARG11); #define DEF_POINTER_TYPE(ENUM, TYPE) \ case ENUM: return make_ptr_type (ENUM, TYPE); @@ -350,8 +349,8 @@ builtins_manager::make_type (enum jit_builtin_type type_id) #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_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE default: diff --git a/gcc/jit/jit-builtins.h b/gcc/jit/jit-builtins.h index fdf1323b908..0b6f9744192 100644 --- a/gcc/jit/jit-builtins.h +++ b/gcc/jit/jit-builtins.h @@ -50,10 +50,10 @@ enum jit_builtin_type #define DEF_FUNCTION_TYPE_VAR_4(NAME, RETURN, ARG1, ARG2, ARG3, ARG4) NAME, #define DEF_FUNCTION_TYPE_VAR_5(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ NAME, +#define DEF_FUNCTION_TYPE_VAR_6(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + 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 @@ -73,7 +73,6 @@ enum jit_builtin_type #undef DEF_FUNCTION_TYPE_VAR_4 #undef DEF_FUNCTION_TYPE_VAR_5 #undef DEF_FUNCTION_TYPE_VAR_7 -#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE BT_LAST }; /* enum jit_builtin_type */ -- 2.30.2