From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127531 invoked by alias); 24 Feb 2015 17:02:11 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 127502 invoked by uid 89); 24 Feb 2015 17:02:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,SPF_PASS,UPPERCASE_50_75 autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 4 recipients X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 24 Feb 2015 17:02:07 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1YQIrx-00072d-M2 from Thomas_Schwinge@mentor.com ; Tue, 24 Feb 2015 09:02:02 -0800 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Tue, 24 Feb 2015 17:01:59 +0000 From: Thomas Schwinge To: , CC: , , , , , Subject: Re: [PR libgomp/64625] Remove __OFFLOAD_TABLE__ variable/formal parameter In-Reply-To: <87r3uuzcqg.fsf@kepler.schwinge.homeip.net> References: <87egqvu77s.fsf@schwinge.name> <87r3uuzcqg.fsf@kepler.schwinge.homeip.net> User-Agent: Notmuch/0.9-101-g81dad07 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Tue, 24 Feb 2015 17:23:00 -0000 Message-ID: <87r3tf9rb5.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" X-SW-Source: 2015-02/txt/msg01420.txt.bz2 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-length: 32285 Hi! On Fri, 16 Jan 2015 21:34:15 +0100, I wrote: > On Thu, 15 Jan 2015 21:20:07 +0100, I wrote: > > In r219682, I have committed to trunk our current set of OpenACC change= s, >=20 > Here is a patch to remove the __OFFLOAD_SYMBOL__ variable/formal > parameter, as discussed in . > commit 4409d0129118479c1cd1adbcfa96316ac4e734b0 > Author: Thomas Schwinge > Date: Fri Jan 16 20:12:12 2015 +0100 >=20 > [PR libgomp/64625] Remove __OFFLOAD_TABLE__ variable/formal parameter. >=20=20=20=20=20 > gcc/ > * omp-low.c (offload_symbol_decl): Remove variable. > (get_offload_symbol_decl): Remove function. > (expand_omp_target): For BUILT_IN_GOMP_TARGET, > BUILT_IN_GOMP_TARGET_DATA, BUILT_IN_GOMP_TARGET_UPDATE pass NULL > instead of &__OFFLOAD_TABLE__, for BUILT_IN_GOACC_DATA_START, > BUILT_IN_GOACC_ENTER_EXIT_DATA, BUILT_IN_GOACC_PARALLEL, > BUILT_IN_GOACC_UPDATE don't pass it at all. > libgomp/ > * libgomp_g.h (GOACC_data_start, GOACC_enter_exit_data) > (GOACC_parallel, GOACC_update): Remove const_void *offload_table > formal parameter. Update all users. > * target.c (GOMP_target, GOMP_target_data, GOMP_target_update): > Document unused formal parameter. This I committed in r219836. Turns out, that patch was incomplete, but nobody noticed, not even GCC itself. Committed to trunk in r220944: commit 6349b8cc3e359740c942717ca463f88b91bc034c Author: tschwinge Date: Tue Feb 24 17:00:36 2015 +0000 [PR libgomp/64625] Remove __OFFLOAD_TABLE__ variable/formal parameter. =20=20=20=20 Fixup for r219836: adjust builtin function prototypes. =20=20=20=20 PR libgomp/64625 gcc/ * omp-builtins.def (BUILT_IN_GOACC_DATA_START): Specify as BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, not BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR. (BUILT_IN_GOACC_ENTER_EXIT_DATA, BUILT_IN_GOACC_UPDATE): Specify as BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, not BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR. (BUILT_IN_GOACC_PARALLEL): Specify as BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR, not BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR. * builtin-types.def (BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR) (BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): Remove function types. (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR) (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR) (BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): New function types. gcc/ada/ * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8) (DEF_FUNCTION_TYPE_VAR_12): Remove macros. (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. gcc/c-family/ * c-common.c (DEF_FUNCTION_TYPE_VAR_8, DEF_FUNCTION_TYPE_VAR_12): Remove macros. (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. gcc/fortran/ * f95-lang.c (DEF_FUNCTION_TYPE_VAR_8, DEF_FUNCTION_TYPE_VAR_12): Remove macros. (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. * types.def (BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR) (BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): Remove function types. (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR) (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR) (BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): New function types. gcc/jit/ * jit-builtins.c (DEF_FUNCTION_TYPE_VAR_8) (DEF_FUNCTION_TYPE_VAR_12): Remove macros. (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. * jit-builtins.h (DEF_FUNCTION_TYPE_VAR_8) (DEF_FUNCTION_TYPE_VAR_12): Remove macros. (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. gcc/lto/ * lto-lang.c (DEF_FUNCTION_TYPE_VAR_8, DEF_FUNCTION_TYPE_VAR_12): Remove macros. (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. =20=20=20=20 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220944 138bc75d-0d04-04= 10-961f-82ee72b054a4 --- gcc/ChangeLog | 21 ++++++++++++++++++++ gcc/ada/ChangeLog | 7 +++++++ gcc/ada/gcc-interface/utils.c | 35 +++++++++++++++----------------- gcc/builtin-types.def | 10 ++++++---- gcc/c-family/ChangeLog | 7 +++++++ gcc/c-family/c-common.c | 34 +++++++++++++++---------------- gcc/fortran/ChangeLog | 14 +++++++++++++ gcc/fortran/f95-lang.c | 26 +++++++++++------------- gcc/fortran/types.def | 10 ++++++---- gcc/jit/ChangeLog | 10 ++++++++++ gcc/jit/jit-builtins.c | 44 +++++++++++++++++++++++--------------= ---- gcc/jit/jit-builtins.h | 24 +++++++++++----------- gcc/lto/ChangeLog | 7 +++++++ gcc/lto/lto-lang.c | 34 +++++++++++++++---------------- gcc/omp-builtins.def | 8 ++++---- 15 files changed, 180 insertions(+), 111 deletions(-) diff --git gcc/ChangeLog gcc/ChangeLog index bcae92c..38ed447 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,24 @@ +2015-02-24 Thomas Schwinge + + PR libgomp/64625 + * omp-builtins.def (BUILT_IN_GOACC_DATA_START): Specify as + BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, not + BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR. + (BUILT_IN_GOACC_ENTER_EXIT_DATA, BUILT_IN_GOACC_UPDATE): Specify as + BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, not + BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR. + (BUILT_IN_GOACC_PARALLEL): Specify as + BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR, not + BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR. + * builtin-types.def + (BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR) + (BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): + Remove function types. + (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR) + (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR) + (BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): + New function types. + 2015-02-24 Georg-Johann Lay =20 * config/avr/stdfix.h [__WITH_AVRLIBC__]: Include . diff --git gcc/ada/ChangeLog gcc/ada/ChangeLog index 6fdaaf7..9472434 100644 --- gcc/ada/ChangeLog +++ gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2015-02-24 Thomas Schwinge + + PR libgomp/64625 + * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8) + (DEF_FUNCTION_TYPE_VAR_12): Remove macros. + (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. + 2015-02-23 Thomas Schwinge =20 * gcc-interface/utils.c (DEF_FUNCTION_TYPE_VAR_8): Fix number of diff --git gcc/ada/gcc-interface/utils.c gcc/ada/gcc-interface/utils.c index d076da7..4fa3d32 100644 --- gcc/ada/gcc-interface/utils.c +++ gcc/ada/gcc-interface/utils.c @@ -5343,13 +5343,11 @@ enum c_builtin_type #define DEF_FUNCTION_TYPE_VAR_3(NAME, RETURN, ARG1, ARG2, ARG3) NAME, #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_8(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) \ - NAME, -#define DEF_FUNCTION_TYPE_VAR_12(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ - NAME, + 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, ARG= 5, \ + ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE @@ -5368,8 +5366,8 @@ enum c_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_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE BT_LAST }; @@ -5475,14 +5473,13 @@ install_builtin_function_types (void) def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4); #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= ) \ def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); -#define DEF_FUNCTION_TYPE_VAR_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) \ - def_fn_type (ENUM, RETURN, 1, 8, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \ - ARG7, ARG8); -#define DEF_FUNCTION_TYPE_VAR_12(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ - def_fn_type (ENUM, RETURN, 1, 12, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, \ - ARG7, ARG8, ARG9, ARG10, ARG11, ARG12); +#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, ARG= 7); +#define DEF_FUNCTION_TYPE_VAR_11(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ + 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] =3D build_pointer_type (builtin_types[(int) TY= PE]); =20 @@ -5504,8 +5501,8 @@ install_builtin_function_types (void) #undef DEF_FUNCTION_TYPE_VAR_3 #undef DEF_FUNCTION_TYPE_VAR_4 #undef DEF_FUNCTION_TYPE_VAR_5 -#undef DEF_FUNCTION_TYPE_VAR_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE builtin_types[(int) BT_LAST] =3D NULL_TREE; } diff --git gcc/builtin-types.def gcc/builtin-types.def index 3412677..0e34531 100644 --- gcc/builtin-types.def +++ gcc/builtin-types.def @@ -492,6 +492,8 @@ DEF_FUNCTION_TYPE_5 (BT_FN_BOOL_VPTR_PTR_I8_INT_INT, BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I8, BT_INT, BT_INT) DEF_FUNCTION_TYPE_5 (BT_FN_BOOL_VPTR_PTR_I16_INT_INT, BT_BOOL, BT_VOLATILE_PTR, BT_PTR, BT_I16, BT_INT, BT_INT) +DEF_FUNCTION_TYPE_5 (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, + BT_VOID, BT_INT, BT_SIZE, BT_PTR, BT_PTR, BT_PTR) DEF_FUNCTION_TYPE_5 (BT_FN_VOID_OMPFN_PTR_UINT_UINT_UINT, BT_VOID, BT_PTR_FN_VOID_PTR, BT_PTR, BT_UINT, BT_UINT, BT_UINT) @@ -588,12 +590,12 @@ DEF_FUNCTION_TYPE_VAR_5 (BT_FN_INT_STRING_SIZE_INT_SI= ZE_CONST_STRING_VAR, DEF_FUNCTION_TYPE_VAR_5 (BT_FN_INT_INT_INT_INT_INT_INT_VAR, BT_INT, BT_INT, BT_INT, BT_INT, BT_INT, BT_INT) =20 -DEF_FUNCTION_TYPE_VAR_8 (BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR, - BT_VOID, BT_INT, BT_PTR, BT_SIZE, BT_PTR, BT_PTR, +DEF_FUNCTION_TYPE_VAR_7 (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, + BT_VOID, BT_INT, BT_SIZE, BT_PTR, BT_PTR, BT_PTR, BT_INT, BT_INT) =20 -DEF_FUNCTION_TYPE_VAR_12 (BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_IN= T_INT_INT_INT_VAR, - BT_VOID, BT_INT, BT_PTR_FN_VOID_PTR, BT_PTR, BT_SIZE, +DEF_FUNCTION_TYPE_VAR_11 (BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_IN= T_INT_INT_VAR, + BT_VOID, BT_INT, BT_PTR_FN_VOID_PTR, BT_SIZE, BT_PTR, BT_PTR, BT_PTR, BT_INT, BT_INT, BT_INT, BT_INT, BT_INT) =20 diff --git gcc/c-family/ChangeLog gcc/c-family/ChangeLog index 45261cd..ffa01c6 100644 --- gcc/c-family/ChangeLog +++ gcc/c-family/ChangeLog @@ -1,3 +1,10 @@ +2015-02-24 Thomas Schwinge + + PR libgomp/64625 + * c-common.c (DEF_FUNCTION_TYPE_VAR_8, DEF_FUNCTION_TYPE_VAR_12): + Remove macros. + (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. + 2015-02-16 Marek Polacek =20 PR c/65066 diff --git gcc/c-family/c-common.c gcc/c-family/c-common.c index 3c18d1c..8c23e09 100644 --- gcc/c-family/c-common.c +++ gcc/c-family/c-common.c @@ -5236,12 +5236,11 @@ enum c_builtin_type #define DEF_FUNCTION_TYPE_VAR_3(NAME, RETURN, ARG1, ARG2, ARG3) NAME, #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_8(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) NAME, -#define DEF_FUNCTION_TYPE_VAR_12(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, \ - ARG12) NAME, + 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, ARG= 5, \ + ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE @@ -5260,8 +5259,8 @@ enum c_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_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE BT_LAST }; @@ -5354,14 +5353,13 @@ c_define_builtins (tree va_list_ref_type_node, tree= va_list_arg_type_node) def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4); #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= ) \ def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); -#define DEF_FUNCTION_TYPE_VAR_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) \ - def_fn_type (ENUM, RETURN, 1, 8, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, = \ - ARG7, ARG8); -#define DEF_FUNCTION_TYPE_VAR_12(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ - def_fn_type (ENUM, RETURN, 1, 12, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, = \ - ARG7, ARG8, ARG9, ARG10, ARG11, ARG12); +#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, ARG= 7); +#define DEF_FUNCTION_TYPE_VAR_11(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ + 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] =3D build_pointer_type (builtin_types[(int) TY= PE]); =20 @@ -5383,8 +5381,8 @@ c_define_builtins (tree va_list_ref_type_node, tree v= a_list_arg_type_node) #undef DEF_FUNCTION_TYPE_VAR_3 #undef DEF_FUNCTION_TYPE_VAR_4 #undef DEF_FUNCTION_TYPE_VAR_5 -#undef DEF_FUNCTION_TYPE_VAR_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE builtin_types[(int) BT_LAST] =3D NULL_TREE; =20 diff --git gcc/fortran/ChangeLog gcc/fortran/ChangeLog index d80c59b..100e04d 100644 --- gcc/fortran/ChangeLog +++ gcc/fortran/ChangeLog @@ -1,3 +1,17 @@ +2015-02-24 Thomas Schwinge + + PR libgomp/64625 + * f95-lang.c (DEF_FUNCTION_TYPE_VAR_8, DEF_FUNCTION_TYPE_VAR_12): + Remove macros. + (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. + * types.def (BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR) + (BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): + Remove function types. + (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR) + (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR) + (BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR): + New function types. + 2015-02-22 Bernd Edlinger =20 PR fortran/64980 diff --git gcc/fortran/f95-lang.c gcc/fortran/f95-lang.c index 94f7479..de9c813 100644 --- gcc/fortran/f95-lang.c +++ gcc/fortran/f95-lang.c @@ -673,10 +673,10 @@ gfc_init_builtin_functions (void) ARG6, ARG7, ARG8) NAME, #define DEF_FUNCTION_TYPE_VAR_0(NAME, RETURN) NAME, #define DEF_FUNCTION_TYPE_VAR_2(NAME, RETURN, ARG1, ARG2) NAME, -#define DEF_FUNCTION_TYPE_VAR_8(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) NAME, -#define DEF_FUNCTION_TYPE_VAR_12(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) 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, ARG= 5, \ + ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "types.def" #undef DEF_PRIMITIVE_TYPE @@ -691,8 +691,8 @@ gfc_init_builtin_functions (void) #undef DEF_FUNCTION_TYPE_8 #undef DEF_FUNCTION_TYPE_VAR_0 #undef DEF_FUNCTION_TYPE_VAR_2 -#undef DEF_FUNCTION_TYPE_VAR_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE BT_LAST }; @@ -1133,8 +1133,8 @@ gfc_init_builtin_functions (void) builtin_types[(int) ARG1], \ builtin_types[(int) ARG2], \ NULL_TREE); -#define DEF_FUNCTION_TYPE_VAR_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) \ +#define DEF_FUNCTION_TYPE_VAR_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ + ARG6, ARG7) \ builtin_types[(int) ENUM] \ =3D build_varargs_function_type_list (builtin_types[(int) RETURN], \ builtin_types[(int) ARG1], \ @@ -1144,10 +1144,9 @@ gfc_init_builtin_functions (void) builtin_types[(int) ARG5], \ builtin_types[(int) ARG6], \ builtin_types[(int) ARG7], \ - builtin_types[(int) ARG8], \ NULL_TREE); -#define DEF_FUNCTION_TYPE_VAR_12(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ +#define DEF_FUNCTION_TYPE_VAR_11(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ + ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) \ builtin_types[(int) ENUM] \ =3D build_varargs_function_type_list (builtin_types[(int) RETURN], \ builtin_types[(int) ARG1], \ @@ -1161,7 +1160,6 @@ gfc_init_builtin_functions (void) builtin_types[(int) ARG9], \ builtin_types[(int) ARG10], \ builtin_types[(int) ARG11], \ - builtin_types[(int) ARG12], \ NULL_TREE); #define DEF_POINTER_TYPE(ENUM, TYPE) \ builtin_types[(int) ENUM] \ @@ -1179,8 +1177,8 @@ gfc_init_builtin_functions (void) #undef DEF_FUNCTION_TYPE_8 #undef DEF_FUNCTION_TYPE_VAR_0 #undef DEF_FUNCTION_TYPE_VAR_2 -#undef DEF_FUNCTION_TYPE_VAR_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE builtin_types[(int) BT_LAST] =3D NULL_TREE; =20 diff --git gcc/fortran/types.def gcc/fortran/types.def index fdae28d..62cac49 100644 --- gcc/fortran/types.def +++ gcc/fortran/types.def @@ -163,6 +163,8 @@ DEF_FUNCTION_TYPE_5 (BT_FN_BOOL_LONG_LONG_LONG_LONGPTR_= LONGPTR, BT_PTR_LONG, BT_PTR_LONG) DEF_FUNCTION_TYPE_5 (BT_FN_VOID_SIZE_VPTR_PTR_PTR_INT, BT_VOID, BT_SIZE, BT_VOLATILE_PTR, BT_PTR, BT_PTR, BT_INT) +DEF_FUNCTION_TYPE_5 (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, + BT_VOID, BT_INT, BT_SIZE, BT_PTR, BT_PTR, BT_PTR) =20 DEF_FUNCTION_TYPE_6 (BT_FN_BOOL_LONG_LONG_LONG_LONG_LONGPTR_LONGPTR, BT_BOOL, BT_LONG, BT_LONG, BT_LONG, BT_LONG, @@ -213,11 +215,11 @@ DEF_FUNCTION_TYPE_VAR_0 (BT_FN_VOID_VAR, BT_VOID) =20 DEF_FUNCTION_TYPE_VAR_2 (BT_FN_VOID_INT_INT_VAR, BT_VOID, BT_INT, BT_INT) =20 -DEF_FUNCTION_TYPE_VAR_8 (BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR, - BT_VOID, BT_INT, BT_PTR, BT_SIZE, BT_PTR, BT_PTR, +DEF_FUNCTION_TYPE_VAR_7 (BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, + BT_VOID, BT_INT, BT_SIZE, BT_PTR, BT_PTR, BT_PTR, BT_INT, BT_INT) =20 -DEF_FUNCTION_TYPE_VAR_12 (BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_IN= T_INT_INT_INT_VAR, - BT_VOID, BT_INT, BT_PTR_FN_VOID_PTR, BT_PTR, BT_SIZE, +DEF_FUNCTION_TYPE_VAR_11 (BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_IN= T_INT_INT_VAR, + BT_VOID, BT_INT, BT_PTR_FN_VOID_PTR, BT_SIZE, BT_PTR, BT_PTR, BT_PTR, BT_INT, BT_INT, BT_INT, BT_INT, BT_INT) diff --git gcc/jit/ChangeLog gcc/jit/ChangeLog index fa138a9..8bf6751 100644 --- gcc/jit/ChangeLog +++ gcc/jit/ChangeLog @@ -1,3 +1,13 @@ +2015-02-24 Thomas Schwinge + + PR libgomp/64625 + * jit-builtins.c (DEF_FUNCTION_TYPE_VAR_8) + (DEF_FUNCTION_TYPE_VAR_12): Remove macros. + (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. + * jit-builtins.h (DEF_FUNCTION_TYPE_VAR_8) + (DEF_FUNCTION_TYPE_VAR_12): Remove macros. + (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. + 2015-02-04 David Malcolm =20 PR jit/64257 diff --git gcc/jit/jit-builtins.c gcc/jit/jit-builtins.c index 47b0198..5bf4a67 100644 --- gcc/jit/jit-builtins.c +++ gcc/jit/jit-builtins.c @@ -288,19 +288,23 @@ builtins_manager::make_type (enum jit_builtin_type ty= pe_id) #define DEF_FUNCTION_TYPE_3(ENUM, RETURN, ARG1, ARG2, ARG3) \ case ENUM: return make_fn_type (ENUM, RETURN, 0, 3, ARG1, ARG2, ARG3= ); #define DEF_FUNCTION_TYPE_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \ - case ENUM: return make_fn_type (ENUM, RETURN, 0, 4, ARG1, ARG2, ARG3= , ARG4); -#define DEF_FUNCTION_TYPE_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ - case ENUM: return make_fn_type (ENUM, RETURN, 0, 5, ARG1, ARG2, ARG3= , ARG4, ARG5); + case ENUM: return make_fn_type (ENUM, RETURN, 0, 4, ARG1, ARG2, ARG3= , \ + ARG4); +#define DEF_FUNCTION_TYPE_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ + case ENUM: return make_fn_type (ENUM, RETURN, 0, 5, ARG1, ARG2, ARG3= , \ + ARG4, ARG5); #define DEF_FUNCTION_TYPE_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6) \ - case ENUM: return make_fn_type (ENUM, RETURN, 0, 6, ARG1, ARG2, ARG3= , ARG4, ARG5, ARG6); + case ENUM: return make_fn_type (ENUM, RETURN, 0, 6, ARG1, ARG2, ARG3= , \ + ARG4, ARG5, ARG6); #define DEF_FUNCTION_TYPE_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7) \ - case ENUM: return make_fn_type (ENUM, RETURN, 0, 7, ARG1, ARG2, ARG3= , ARG4, ARG5, ARG6, ARG7); + case ENUM: return make_fn_type (ENUM, RETURN, 0, 7, ARG1, ARG2, ARG3= , \ + ARG4, ARG5, ARG6, ARG7); #define DEF_FUNCTION_TYPE_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ ARG6, ARG7, ARG8) \ - case ENUM: return make_fn_type (ENUM, RETURN, 0, 8, ARG1, ARG2, ARG3= , ARG4, ARG5, ARG6, \ - ARG7, ARG8); + case ENUM: return make_fn_type (ENUM, RETURN, 0, 8, ARG1, ARG2, ARG3= , \ + ARG4, ARG5, ARG6, ARG7, ARG8); #define DEF_FUNCTION_TYPE_VAR_0(ENUM, RETURN) \ case ENUM: return make_fn_type (ENUM, RETURN, 1, 0); #define DEF_FUNCTION_TYPE_VAR_1(ENUM, RETURN, ARG1) \ @@ -310,18 +314,20 @@ builtins_manager::make_type (enum jit_builtin_type ty= pe_id) #define DEF_FUNCTION_TYPE_VAR_3(ENUM, RETURN, ARG1, ARG2, ARG3) \ case ENUM: return make_fn_type (ENUM, RETURN, 1, 3, ARG1, ARG2, ARG3= ); #define DEF_FUNCTION_TYPE_VAR_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \ - case ENUM: return make_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3= , ARG4); + case ENUM: return make_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3= , \ + ARG4); #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_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) \ - case ENUM: return make_fn_type (ENUM, RETURN, 1, 8, ARG1, ARG2, ARG3= , \ - ARG4, ARG5, ARG6, ARG7, ARG8); -#define DEF_FUNCTION_TYPE_VAR_12(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ - case ENUM: return make_fn_type (ENUM, RETURN, 1, 12, ARG1, ARG2, ARG= 3, \ + case ENUM: return make_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3= , \ + ARG4, ARG5); +#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, ARG= 5, \ + ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) \ + case ENUM: return make_fn_type (ENUM, RETURN, 1, 11, ARG1, ARG2, ARG= 3, \ ARG4, ARG5, ARG6, ARG7, ARG8, ARG9, \ - ARG10, ARG11, ARG12); + ARG10, ARG11); #define DEF_POINTER_TYPE(ENUM, TYPE) \ case ENUM: return make_ptr_type (ENUM, TYPE); =20 @@ -343,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_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE =20 default: diff --git gcc/jit/jit-builtins.h gcc/jit/jit-builtins.h index 9101aaf..fdf1323 100644 --- gcc/jit/jit-builtins.h +++ gcc/jit/jit-builtins.h @@ -37,21 +37,23 @@ enum jit_builtin_type #define DEF_FUNCTION_TYPE_3(NAME, RETURN, ARG1, ARG2, ARG3) NAME, #define DEF_FUNCTION_TYPE_4(NAME, RETURN, ARG1, ARG2, ARG3, ARG4) NAME, #define DEF_FUNCTION_TYPE_5(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) NA= ME, -#define DEF_FUNCTION_TYPE_6(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, AR= G6) NAME, -#define DEF_FUNCTION_TYPE_7(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, AR= G6, ARG7) NAME, -#define DEF_FUNCTION_TYPE_8(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, AR= G6, ARG7, ARG8) NAME, +#define DEF_FUNCTION_TYPE_6(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6) NAME, +#define DEF_FUNCTION_TYPE_7(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6, ARG7) NAME, +#define DEF_FUNCTION_TYPE_8(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \ + ARG6, ARG7, ARG8) NAME, #define DEF_FUNCTION_TYPE_VAR_0(NAME, RETURN) NAME, #define DEF_FUNCTION_TYPE_VAR_1(NAME, RETURN, ARG1) NAME, #define DEF_FUNCTION_TYPE_VAR_2(NAME, RETURN, ARG1, ARG2) NAME, #define DEF_FUNCTION_TYPE_VAR_3(NAME, RETURN, ARG1, ARG2, ARG3) NAME, #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_8(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) NAME, -#define DEF_FUNCTION_TYPE_VAR_12(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ - NAME, + 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, ARG= 5, \ + ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE @@ -70,8 +72,8 @@ 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_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE BT_LAST }; /* enum jit_builtin_type */ diff --git gcc/lto/ChangeLog gcc/lto/ChangeLog index 87f1988..65d5160 100644 --- gcc/lto/ChangeLog +++ gcc/lto/ChangeLog @@ -1,3 +1,10 @@ +2015-02-24 Thomas Schwinge + + PR libgomp/64625 + * lto-lang.c (DEF_FUNCTION_TYPE_VAR_8, DEF_FUNCTION_TYPE_VAR_12): + Remove macros. + (DEF_FUNCTION_TYPE_VAR_7, DEF_FUNCTION_TYPE_VAR_11): New macros. + 2015-02-03 Jan Hubicka =20 * lto-symtab.c (lto_cgraph_replace_node): Maintain merged flag. diff --git gcc/lto/lto-lang.c gcc/lto/lto-lang.c index aa474e0..073bf17 100644 --- gcc/lto/lto-lang.c +++ gcc/lto/lto-lang.c @@ -176,12 +176,11 @@ enum lto_builtin_type #define DEF_FUNCTION_TYPE_VAR_3(NAME, RETURN, ARG1, ARG2, ARG3) NAME, #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, ARG6= ) \ - NAME, -#define DEF_FUNCTION_TYPE_VAR_8(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) NAME, -#define DEF_FUNCTION_TYPE_VAR_12(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, \ - ARG12) NAME, + 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, ARG= 5, \ + ARG6, ARG7, ARG8, ARG9, ARG10, ARG11) NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE @@ -200,8 +199,8 @@ enum lto_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_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE BT_LAST }; @@ -686,14 +685,13 @@ lto_define_builtins (tree va_list_ref_type_node ATTRI= BUTE_UNUSED, def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4); #define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= ) \ def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5); -#define DEF_FUNCTION_TYPE_VAR_8(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5= , \ - ARG6, ARG7, ARG8) \ - def_fn_type (ENUM, RETURN, 1, 8, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, = \ - ARG7, ARG8); -#define DEF_FUNCTION_TYPE_VAR_12(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ - ARG6, ARG7, ARG8, ARG9, ARG10, ARG11, ARG12) \ - def_fn_type (ENUM, RETURN, 1, 12, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, = \ - ARG7, ARG8, ARG9, ARG10, ARG11, ARG12); +#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, ARG= 7); +#define DEF_FUNCTION_TYPE_VAR_11(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG= 5, \ + 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] =3D build_pointer_type (builtin_types[(int) TY= PE]); =20 @@ -715,8 +713,8 @@ lto_define_builtins (tree va_list_ref_type_node ATTRIBU= TE_UNUSED, #undef DEF_FUNCTION_TYPE_VAR_3 #undef DEF_FUNCTION_TYPE_VAR_4 #undef DEF_FUNCTION_TYPE_VAR_5 -#undef DEF_FUNCTION_TYPE_VAR_8 -#undef DEF_FUNCTION_TYPE_VAR_12 +#undef DEF_FUNCTION_TYPE_VAR_7 +#undef DEF_FUNCTION_TYPE_VAR_11 #undef DEF_POINTER_TYPE builtin_types[(int) BT_LAST] =3D NULL_TREE; =20 diff --git gcc/omp-builtins.def gcc/omp-builtins.def index 6aea7b7..50f1321 100644 --- gcc/omp-builtins.def +++ gcc/omp-builtins.def @@ -32,17 +32,17 @@ along with GCC; see the file COPYING3. If not see DEF_GOACC_BUILTIN (BUILT_IN_ACC_GET_DEVICE_TYPE, "acc_get_device_type", BT_FN_INT, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN (BUILT_IN_GOACC_DATA_START, "GOACC_data_start", - BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR, ATTR_NOTHROW_LIST) + BT_FN_VOID_INT_SIZE_PTR_PTR_PTR, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN (BUILT_IN_GOACC_DATA_END, "GOACC_data_end", BT_FN_VOID, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN (BUILT_IN_GOACC_ENTER_EXIT_DATA, "GOACC_enter_exit_data", - BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR, + BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN (BUILT_IN_GOACC_PARALLEL, "GOACC_parallel", - BT_FN_VOID_INT_OMPFN_PTR_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR, + BT_FN_VOID_INT_OMPFN_SIZE_PTR_PTR_PTR_INT_INT_INT_INT_INT_VAR, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN (BUILT_IN_GOACC_UPDATE, "GOACC_update", - BT_FN_VOID_INT_PTR_SIZE_PTR_PTR_PTR_INT_INT_VAR, + BT_FN_VOID_INT_SIZE_PTR_PTR_PTR_INT_INT_VAR, ATTR_NOTHROW_LIST) DEF_GOACC_BUILTIN (BUILT_IN_GOACC_WAIT, "GOACC_wait", BT_FN_VOID_INT_INT_VAR, Gr=C3=BC=C3=9Fe, Thomas --=-=-= Content-Type: application/pgp-signature; name="signature.asc" Content-length: 472 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJU7K5+AAoJEK3/DN1sMFFtv4wH/Aj6pTXBAz2/R8sCNB1z7jnv knsK+/sv4g1BPtfxzgy+r0WxeOUkfpwIAfkE7emxuEpst+zWkl3Wqf6mtcUffchJ v8hDcjowHVcpn/z+Egig3aYVS919WIMEEFRfPQFJuuZo57lHyjKeOB5aVMPIiNkM lrsuoY8L/H4ym3vgw0hdn+H24NXKAB2rhIV5kwb+AHhLg08dyz255qhY3GwugpWm hFkaKVnsOtDZc/i2ZsCB4h54JYyhyK24LQ+wxNzVvx9vmyuuwi+6pjKcEFwpEUyR MOAx1xrBibFobEh72EbfE4zvONQlL9XvZkVGwgcCU7DgCwQHQtFqjI1VXCq1ghk= =Iumm -----END PGP SIGNATURE----- --=-=-=--