From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 44933 invoked by alias); 11 Nov 2015 14:19:09 -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 44921 invoked by uid 89); 11 Nov 2015 14:19:08 -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,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 11 Nov 2015 14:19:07 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 6986E8E237; Wed, 11 Nov 2015 14:19:06 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tABEJ4IZ024273 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 11 Nov 2015 09:19:05 -0500 Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id tABEJ3VB027707; Wed, 11 Nov 2015 15:19:03 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id tABEJ2ts027706; Wed, 11 Nov 2015 15:19:02 +0100 Date: Wed, 11 Nov 2015 14:19:00 -0000 From: Jakub Jelinek To: "Dominique =?iso-8859-1?Q?d'Humi=E8res?=" Cc: gcc-patches Subject: Re: [PATCH] PR68271 [6 Regression] Boostrap fails on x86_64-apple-darwin14 at r230084 Message-ID: <20151111141902.GH5675@tucnak.redhat.com> Reply-To: Jakub Jelinek References: <9219A6A9-0D23-47B1-99DF-892D310754EF@lps.ens.fr> <20151111131441.GG5675@tucnak.redhat.com> <7FDDBC10-24BC-46D6-B497-E5D72091A852@lps.ens.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7FDDBC10-24BC-46D6-B497-E5D72091A852@lps.ens.fr> User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes X-SW-Source: 2015-11/txt/msg01378.txt.bz2 On Wed, Nov 11, 2015 at 03:10:37PM +0100, Dominique d'Humières wrote: > Is the following OK? > > Index: gcc/ChangeLog > =================================================================== > --- gcc/ChangeLog (revision 230162) > +++ gcc/ChangeLog (working copy) > @@ -1,3 +1,10 @@ > +2015-11-11 Dominique d'Humieres > + > + PR bootstrap/68271 > + * cp/parser.h (cp_token): Update pragma_kind to 8. > + * c-family/c-pragma.c (c_register_pragma_1): Update the gcc_assert > + to 256. > + The ChangeLog entry is not. Only one space after PR, two spaces before < and both cp and c-family subdirectories have their own ChangeLog entries, so you need PR bootstrap/68271 * parser.h (cp_token): Update pragma_kind to 8. in cp/ChangeLog and PR bootstrap/68271 * c-pragma.c (c_register_pragma_1): Update the gcc_assert to 256. in c-family/ChangeLog. Ok with those changes. Jakub