From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <binutils-return-73430-listarch-binutils=sources.redhat.com@sourceware.org>
Received: (qmail 21505 invoked by alias); 11 Nov 2011 21:24:45 -0000
Received: (qmail 21462 invoked by uid 22791); 11 Nov 2011 21:24:44 -0000
X-SWARE-Spam-Status: No, hits=-3.9 required=5.0	tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mail-pz0-f49.google.com (HELO mail-pz0-f49.google.com) (209.85.210.49)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 11 Nov 2011 21:24:29 +0000
Received: by pzk6 with SMTP id 6so3851245pzk.8        for <binutils@sourceware.org>; Fri, 11 Nov 2011 13:24:28 -0800 (PST)
Received: by 10.68.35.129 with SMTP id h1mr27539644pbj.92.1321046668855;        Fri, 11 Nov 2011 13:24:28 -0800 (PST)
Received: by 10.68.35.129 with SMTP id h1mr27539628pbj.92.1321046668761;        Fri, 11 Nov 2011 13:24:28 -0800 (PST)
Received: from coign.google.com ([2620:0:1000:2301:f2de:f1ff:fe40:72a8])        by mx.google.com with ESMTPS id b4sm32901294pbc.19.2011.11.11.13.24.27        (version=TLSv1/SSLv3 cipher=OTHER);        Fri, 11 Nov 2011 13:24:28 -0800 (PST)
From: Ian Lance Taylor <iant@google.com>
To: Sterling Augustine <saugustine@google.com>
Cc: binutils@sourceware.org
Subject: Re: [GOLD Patch] Grammar additions to handle INCLUDE directives
References: <CAEG7qUxHUkodtk==szof59QmN8tciRAL9ib3WRo_crtAOduqFw@mail.gmail.com>
Date: Fri, 11 Nov 2011 21:24:00 -0000
In-Reply-To: <CAEG7qUxHUkodtk==szof59QmN8tciRAL9ib3WRo_crtAOduqFw@mail.gmail.com>	(Sterling Augustine's message of "Fri, 11 Nov 2011 12:12:38 -0800")
Message-ID: <mcrhb2afj3o.fsf@dhcp-172-18-216-180.mtv.corp.google.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-IsSubscribed: yes
Mailing-List: contact binutils-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <binutils.sourceware.org>
List-Subscribe: <mailto:binutils-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/binutils/>
List-Post: <mailto:binutils@sourceware.org>
List-Help: <mailto:binutils-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: binutils-owner@sourceware.org
X-SW-Source: 2011-11/txt/msg00092.txt.bz2

Sterling Augustine <saugustine@google.com> writes:

> 2011-11-11  Sterling Augustine  <saugustine@google.com>
>
> 	* yyscript.y (section_cmd): Add support for INCLUDE directive.
> 	(file_or_sections_cmd): Likewise.
>
> Index: yyscript.y
> ===================================================================
> RCS file: /cvs/src/src/gold/yyscript.y,v
> retrieving revision 1.26
> diff -u -r1.26 yyscript.y
> --- yyscript.y	8 Sep 2010 16:10:31 -0000	1.26
> +++ yyscript.y	11 Nov 2011 20:06:21 -0000
> @@ -528,6 +528,8 @@
>  		 nothing, we accept it and ignore it.  */
>  	    }
>  	| SORT_BY_NAME '(' CONSTRUCTORS ')'
> +	| INCLUDE string
> +	  { script_include_directive(closure, $2.value, $2.length); }
>  	| ';'
>  	;
>  
> @@ -689,6 +691,8 @@
>  	| assignment end
>  	| ASSERT_K '(' parse_exp ',' string ')'
>  	    { script_add_assertion(closure, $3, $5.value, $5.length); }
> +	| INCLUDE string
> +	  { script_include_directive(closure, $2.value, $2.length); }
>  	;
>  
>  /* A list of MEMORY definitions.  */


The indentation looks wrong.  The left brace should be under the 'C', or
in other words it should line up under the other left braces in the
file.  (It's wrong in the other call to script_include_directive also).

This is OK if you fix that, or if it is already correct and just munged
by diff or mail.

Thanks.

Ian