From patchwork Tue Jun 11 06:06:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 250442 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id B23272C009F for ; Tue, 11 Jun 2013 16:06:52 +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:date :from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:in-reply-to; q=dns; s=default; b=X9bZB2GeMly9cji64 mjIeVbRLbkpoDEbXkiGtOaAsuvijk5feGxdADqAIarC1eVCbq/j8X1TJ8GzpD1I5 1Z3ZFuybx0qJRLk/C9QIO1mQONgIxGl1tRw4VklCGgFJgNeDAc1nYX8BP8tDgmru cPsaBgY7yhCcxf2MHh3G31jjk0= 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:date :from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:in-reply-to; s=default; bh=tuD1GOMaQoHlMLjGQtWeX0y +FP4=; b=bOBRrlenkRJCd0kzOW1o4XdKnhsB3hURDTCXQvUeyajx3lfrltGB0yX 7JrIehOX3rBYUxLwC4oId/8/M9Lw8LoKdTLsF/E1+mYHZyizbBabmLOtlMdbxFFt rhbrvwKzvCIEebLAQBzAyJMfNLuc+XfskqD7XYTWqt4ORc6ryHZc= Received: (qmail 7441 invoked by alias); 11 Jun 2013 06:06:46 -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 7432 invoked by uid 89); 11 Jun 2013 06:06:46 -0000 X-Spam-SWARE-Status: No, score=-6.4 required=5.0 tests=AWL, BAYES_00, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 11 Jun 2013 06:06:45 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5B66i5Z008485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 11 Jun 2013 02:06:44 -0400 Received: from zalov.cz (vpn-54-88.rdu2.redhat.com [10.10.54.88]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5B66gCo026897 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 11 Jun 2013 02:06:43 -0400 Received: from zalov.cz (localhost [127.0.0.1]) by zalov.cz (8.14.5/8.14.5) with ESMTP id r5B66fvn028781; Tue, 11 Jun 2013 08:06:41 +0200 Received: (from jakub@localhost) by zalov.cz (8.14.5/8.14.5/Submit) id r5B66eTp028780; Tue, 11 Jun 2013 08:06:40 +0200 Date: Tue, 11 Jun 2013 08:06:38 +0200 From: Jakub Jelinek To: DJ Delorie Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] DATA_ALIGNMENT vs. DATA_ABI_ALIGNMENT (PR target/56564) Message-ID: <20130611060638.GW1493@tucnak.redhat.com> Reply-To: Jakub Jelinek References: <20130607192540.GH1493@tucnak.redhat.com> <51B245EF.3080602@redhat.com> <20130607211419.GI1493@tucnak.redhat.com> <51B5E80A.2040600@redhat.com> <20130610154421.GU1493@tucnak.redhat.com> <201306110044.r5B0i5VR006167@greed.delorie.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <201306110044.r5B0i5VR006167@greed.delorie.com> User-Agent: Mutt/1.5.21 (2010-09-15) On Mon, Jun 10, 2013 at 08:44:05PM -0400, DJ Delorie wrote: > > > @@ -986,12 +1053,10 @@ align_variable (tree decl, bool dont_out > > if (! DECL_THREAD_LOCAL_P (decl) || const_align <= BITS_PER_WORD) > > align = const_align; > > } > > -#endif > > } > > +#endif > > I think this change in get_variable_align() is wrong; it results in > unbalanced braces inside an #ifdef, if the #ifdef body is not included > (i.e. CONSTANT_ALIGNMENT not defined), the compile fails... You are right, fixed thusly, committed as obvious: 2013-06-11 Jakub Jelinek PR target/56564 * varasm.c (get_variable_align): Move #endif to the right place. Jakub --- gcc/varasm.c (revision 199933) +++ gcc/varasm.c (revision 199934) @@ -1053,8 +1053,8 @@ get_variable_align (tree decl) if (! DECL_THREAD_LOCAL_P (decl) || const_align <= BITS_PER_WORD) align = const_align; } - } #endif + } return align; }