From patchwork Wed Sep 30 15:18:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 524451 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 CE8E1140D24 for ; Thu, 1 Oct 2015 01:18:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=b8XGB4Ln; dkim-atps=neutral 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=fwhh+HhOdo0qSoIz DhByf4Y9caxzqx7bdVF1m94PcM7RmUhwD5+LK0Wb7TFF6GZLZzXSUf/SAVKdJUQp Wfijj9QhErJt2QKDRrI+NG1c9T+snoBUyr7WWRoiG18xST/Lc1EbK27TK/SuK+PC t4rnYI8IaYcJZeko1J57caqG+WQ= 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=WYc3slUn6aH7G0N1AT7sxf PHzOk=; b=b8XGB4Ln6RnTC7Vwo52ATmhC+edPgfQcnpkZgcwkp09hTZpiWFPv92 749+nbbkbmxyCApdu1SxYVmg7tnV4JhCyCZ7dtio9TllltxI5HVXtYSe/7aLPQTt aDOlq1z/NQJnN9f20YQUJuL+e6zzvPcq4YrZPANRTaxUnHNDgzUV4= Received: (qmail 70559 invoked by alias); 30 Sep 2015 15:18:39 -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 70548 invoked by uid 89); 30 Sep 2015 15:18:38 -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 autolearn=ham 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; Wed, 30 Sep 2015 15:18:37 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZhJ9M-0005Yv-Rr from Thomas_Schwinge@mentor.com ; Wed, 30 Sep 2015 08:18:33 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Wed, 30 Sep 2015 16:18:31 +0100 From: Thomas Schwinge To: Ulrich Drepper , GCC Patches CC: Jakub Jelinek , Nathan Sidwell , Bernd Schmidt , Tom de Vries Subject: Re: JIT breakage after last builtin-types change In-Reply-To: References: <871tdgf45y.fsf@gmail.com> <20150930130944.GN1847@tucnak.redhat.com> <56099751.6000208@acm.org> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Wed, 30 Sep 2015 17:18:20 +0200 Message-ID: <87zj04rl4z.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Wed, 30 Sep 2015 09:45:25 -0400, Ulrich Drepper wrote: > Except that this is missing: [...] Yes, I also had already prepared such a patch; now checked in (as obvious), include some further cleanup; r228298: commit 5ab4aeae1dba9c2a04dd213474d8c33b6b69e2e3 Author: tschwinge Date: Wed Sep 30 15:14:29 2015 +0000 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228298 138bc75d-0d04-0410-961f-82ee72b054a4 --- 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(-) Grüße, Thomas diff --git gcc/ada/ChangeLog gcc/ada/ChangeLog index efb2d3a..d4c505c 100644 --- gcc/ada/ChangeLog +++ 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 gcc/ada/gcc-interface/utils.c gcc/ada/gcc-interface/utils.c index 672b910..0f3087d 100644 --- gcc/ada/gcc-interface/utils.c +++ 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 gcc/jit/ChangeLog gcc/jit/ChangeLog index faa8545..05fa9e6 100644 --- gcc/jit/ChangeLog +++ 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 gcc/jit/jit-builtins.h gcc/jit/jit-builtins.h index 0b6f974..3d76247 100644 --- gcc/jit/jit-builtins.h +++ 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