From patchwork Thu May 22 20:16:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 351597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44184140079 for ; Fri, 23 May 2014 06:17:14 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=OX1qpOpxa9MotcQ2/Sm5vGutIyDgRn2viCEEsb/cICOjnZqeLS3pC TtHkMutRdeR5RX6L5hLrgIzT17CaRUe/Gx0WJMEGvW72G86vqxKfKPwGdw3BOErD +Ug2hoICOTaTsuePxQ7noVfzZremqOS8Z8r63lMFP4kIemmYur+Mws= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=D8Dfr/3FlS0GW/lGPy2wyIqxJq0=; b=crp3jv3wkZNzemns3nj0 sZWS23+Dr+gQuQD7QO2V2iWLrK3NlaSA+PhYqSHX8DXr5J/CQ4rkeW5Gerw/CFrI SSahtEtEnRa6b3zDIQq9xJIWgpAlhrHigLeTezvQYhessxAVa5xkkLVKJ4mG8sv1 xVfKEWKNsgU49Bw/Wm5XYsc= Received: (qmail 5792 invoked by alias); 22 May 2014 20:17:06 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 5776 invoked by uid 89); 22 May 2014 20:17:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, UPPERCASE_50_75 autolearn=no version=3.3.2 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; Thu, 22 May 2014 20:17:03 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1WnZQA-000130-7S from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Thu, 22 May 2014 13:16:58 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 22 May 2014 13:16:58 -0700 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.2.247.3; Thu, 22 May 2014 21:16:55 +0100 From: Thomas Schwinge To: Subject: [COMMITTED] Cosmetic fixes for DEF_FUNCTION_TYPE_* macros. Date: Thu, 22 May 2014 22:16:25 +0200 Message-ID: <1400789796-32269-1-git-send-email-thomas@codesourcery.com> MIME-Version: 1.0 From: tschwinge gcc/ada/ * gcc-interface/utils.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. gcc/ * builtin-types.def: Simplify examples for DEF_FUNCTION_TYPE_*. gcc/c-family/ * c-common.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. gcc/fortran/ * f95-lang.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. * types.def: Simplify examples for DEF_FUNCTION_TYPE_*. gcc/lto/ * lto-lang.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210822 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 4 ++++ gcc/ada/ChangeLog | 6 ++++++ gcc/ada/gcc-interface/utils.c | 14 ++++++++++---- gcc/builtin-types.def | 12 ++---------- gcc/c-family/ChangeLog | 6 ++++++ gcc/c-family/c-common.c | 14 ++++++++++---- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/f95-lang.c | 12 +++++++++--- gcc/fortran/types.def | 8 +------- gcc/lto/ChangeLog | 6 ++++++ gcc/lto/lto-lang.c | 12 +++++++++--- 11 files changed, 70 insertions(+), 31 deletions(-) diff --git gcc/ChangeLog gcc/ChangeLog index 65fb502..ace8d99 100644 --- gcc/ChangeLog +++ gcc/ChangeLog @@ -1,3 +1,7 @@ +2014-05-22 Thomas Schwinge + + * builtin-types.def: Simplify examples for DEF_FUNCTION_TYPE_*. + 2012-05-22 Bernd Schmidt * config/darwin.c: Include "lto-section-names.h". diff --git gcc/ada/ChangeLog gcc/ada/ChangeLog index 547b327..8ce8b25 100644 --- gcc/ada/ChangeLog +++ gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2014-05-22 Thomas Schwinge + + * gcc-interface/utils.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) + (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) + (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. + 2014-05-21 Robert Dewar * layout.adb: Minor reformatting. diff --git gcc/ada/gcc-interface/utils.c gcc/ada/gcc-interface/utils.c index 4f39dd6..56636a6 100644 --- gcc/ada/gcc-interface/utils.c +++ gcc/ada/gcc-interface/utils.c @@ -5914,15 +5914,18 @@ enum c_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) 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_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, ARG6) \ +#define DEF_FUNCTION_TYPE_VAR_5(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "builtin-types.def" @@ -6053,12 +6056,15 @@ install_builtin_function_types (void) #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE +#undef DEF_FUNCTION_TYPE_0 #undef DEF_FUNCTION_TYPE_1 #undef DEF_FUNCTION_TYPE_2 #undef DEF_FUNCTION_TYPE_3 #undef DEF_FUNCTION_TYPE_4 #undef DEF_FUNCTION_TYPE_5 #undef DEF_FUNCTION_TYPE_6 +#undef DEF_FUNCTION_TYPE_7 +#undef DEF_FUNCTION_TYPE_8 #undef DEF_FUNCTION_TYPE_VAR_0 #undef DEF_FUNCTION_TYPE_VAR_1 #undef DEF_FUNCTION_TYPE_VAR_2 diff --git gcc/builtin-types.def gcc/builtin-types.def index fba9c7d..f09c335 100644 --- gcc/builtin-types.def +++ gcc/builtin-types.def @@ -29,13 +29,7 @@ along with GCC; see the file COPYING3. If not see DEF_FUNCTION_TYPE_0 (ENUM, RETURN) DEF_FUNCTION_TYPE_1 (ENUM, RETURN, ARG1) DEF_FUNCTION_TYPE_2 (ENUM, RETURN, ARG1, ARG2) - DEF_FUNCTION_TYPE_3 (ENUM, RETURN, ARG1, ARG2, ARG3) - DEF_FUNCTION_TYPE_4 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) - DEF_FUNCTION_TYPE_5 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) - DEF_FUNCTION_TYPE_6 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) - DEF_FUNCTION_TYPE_7 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) - DEF_FUNCTION_TYPE_8 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7, - ARG8) + [...] These macros describe function types. ENUM is as above. The RETURN type is one of the enumerals already defined. ARG1, ARG2, @@ -44,9 +38,7 @@ along with GCC; see the file COPYING3. If not see DEF_FUNCTION_TYPE_VAR_0 (ENUM, RETURN) DEF_FUNCTION_TYPE_VAR_1 (ENUM, RETURN, ARG1) DEF_FUNCTION_TYPE_VAR_2 (ENUM, RETURN, ARG1, ARG2) - DEF_FUNCTION_TYPE_VAR_3 (ENUM, RETURN, ARG1, ARG2, ARG3) - DEF_FUNCTION_TYPE_VAR_4 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) - DEF_FUNCTION_TYPE_VAR_5 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) + [...] Similar, but for function types that take variable arguments. For example: diff --git gcc/c-family/ChangeLog gcc/c-family/ChangeLog index d0bfc27..5e3e541 100644 --- gcc/c-family/ChangeLog +++ gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2014-05-22 Thomas Schwinge + + * c-common.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) + (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) + (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. + 2014-05-21 Richard Sandiford * c-common.h (CTI_VOID_ZERO, void_zero_node): Delete. diff --git gcc/c-family/c-common.c gcc/c-family/c-common.c index c8d9e0c..6ec14fc 100644 --- gcc/c-family/c-common.c +++ gcc/c-family/c-common.c @@ -5128,15 +5128,18 @@ enum c_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) 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_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, ARG6) \ +#define DEF_FUNCTION_TYPE_VAR_5(NAME, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \ NAME, #define DEF_POINTER_TYPE(NAME, TYPE) NAME, #include "builtin-types.def" @@ -5254,12 +5257,15 @@ c_define_builtins (tree va_list_ref_type_node, tree va_list_arg_type_node) #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE +#undef DEF_FUNCTION_TYPE_0 #undef DEF_FUNCTION_TYPE_1 #undef DEF_FUNCTION_TYPE_2 #undef DEF_FUNCTION_TYPE_3 #undef DEF_FUNCTION_TYPE_4 #undef DEF_FUNCTION_TYPE_5 #undef DEF_FUNCTION_TYPE_6 +#undef DEF_FUNCTION_TYPE_7 +#undef DEF_FUNCTION_TYPE_8 #undef DEF_FUNCTION_TYPE_VAR_0 #undef DEF_FUNCTION_TYPE_VAR_1 #undef DEF_FUNCTION_TYPE_VAR_2 diff --git gcc/fortran/ChangeLog gcc/fortran/ChangeLog index f547e87..3889ac4 100644 --- gcc/fortran/ChangeLog +++ gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2014-05-22 Thomas Schwinge + + * f95-lang.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) + (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) + (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. + * types.def: Simplify examples for DEF_FUNCTION_TYPE_*. + 2014-05-17 Trevor Saunders * f95-lang.c (pushlevel): Adjust. diff --git gcc/fortran/f95-lang.c gcc/fortran/f95-lang.c index adee07c..f5d57a8 100644 --- gcc/fortran/f95-lang.c +++ gcc/fortran/f95-lang.c @@ -620,9 +620,12 @@ gfc_init_builtin_functions (void) #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) 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_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_POINTER_TYPE(NAME, TYPE) NAME, #include "types.def" @@ -1020,12 +1023,15 @@ gfc_init_builtin_functions (void) = build_pointer_type (builtin_types[(int) TYPE]); #include "types.def" #undef DEF_PRIMITIVE_TYPE +#undef DEF_FUNCTION_TYPE_0 #undef DEF_FUNCTION_TYPE_1 #undef DEF_FUNCTION_TYPE_2 #undef DEF_FUNCTION_TYPE_3 #undef DEF_FUNCTION_TYPE_4 #undef DEF_FUNCTION_TYPE_5 #undef DEF_FUNCTION_TYPE_6 +#undef DEF_FUNCTION_TYPE_7 +#undef DEF_FUNCTION_TYPE_8 #undef DEF_FUNCTION_TYPE_VAR_0 #undef DEF_POINTER_TYPE builtin_types[(int) BT_LAST] = NULL_TREE; diff --git gcc/fortran/types.def gcc/fortran/types.def index 78fc679..99198e9 100644 --- gcc/fortran/types.def +++ gcc/fortran/types.def @@ -29,13 +29,7 @@ along with GCC; see the file COPYING3. If not see DEF_FUNCTION_TYPE_0 (ENUM, RETURN) DEF_FUNCTION_TYPE_1 (ENUM, RETURN, ARG1) DEF_FUNCTION_TYPE_2 (ENUM, RETURN, ARG1, ARG2) - DEF_FUNCTION_TYPE_3 (ENUM, RETURN, ARG1, ARG2, ARG3) - DEF_FUNCTION_TYPE_4 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) - DEF_FUNCTION_TYPE_5 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) - DEF_FUNCTION_TYPE_6 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) - DEF_FUNCTION_TYPE_7 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) - DEF_FUNCTION_TYPE_8 (ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7, - ARG8) + [...] These macros describe function types. ENUM is as above. The RETURN type is one of the enumerals already defined. ARG1, ARG2, diff --git gcc/lto/ChangeLog gcc/lto/ChangeLog index 790c6c9..79ada63 100644 --- gcc/lto/ChangeLog +++ gcc/lto/ChangeLog @@ -1,3 +1,9 @@ +2014-05-22 Thomas Schwinge + + * lto-lang.c (DEF_FUNCTION_TYPE_0, DEF_FUNCTION_TYPE_6) + (DEF_FUNCTION_TYPE_7, DEF_FUNCTION_TYPE_8) + (DEF_FUNCTION_TYPE_VAR_5): Cosmetic fixes. + 2012-05-22 Bernd Schmidt * lto-object.c: Include "lto-section-names.h". diff --git gcc/lto/lto-lang.c gcc/lto/lto-lang.c index e213e92..937b7e5 100644 --- gcc/lto/lto-lang.c +++ gcc/lto/lto-lang.c @@ -146,9 +146,12 @@ enum lto_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) 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_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, @@ -663,12 +666,15 @@ lto_define_builtins (tree va_list_ref_type_node ATTRIBUTE_UNUSED, #include "builtin-types.def" #undef DEF_PRIMITIVE_TYPE +#undef DEF_FUNCTION_TYPE_0 #undef DEF_FUNCTION_TYPE_1 #undef DEF_FUNCTION_TYPE_2 #undef DEF_FUNCTION_TYPE_3 #undef DEF_FUNCTION_TYPE_4 #undef DEF_FUNCTION_TYPE_5 #undef DEF_FUNCTION_TYPE_6 +#undef DEF_FUNCTION_TYPE_7 +#undef DEF_FUNCTION_TYPE_8 #undef DEF_FUNCTION_TYPE_VAR_0 #undef DEF_FUNCTION_TYPE_VAR_1 #undef DEF_FUNCTION_TYPE_VAR_2