From 6b211b9cc3c61f514423869af51a17e4c2bc7531 Mon Sep 17 00:00:00 2001
From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Tue, 20 Sep 2016 11:18:12 +0100
Subject: [PATCH] ld: Rename pattern within yacc grammar file

Rename file_NAME_list to section_NAME_list in the linker's grammar
file.  This rename reflects how the pattern is now being used, and makes
the grammar easier to understand.

There should be no functional change after this commit.

ld/ChangeLog:

	* ldgram.y: Rename file_NAME_list to section_NAME_list
	throughout.
---
 ld/ChangeLog |  5 +++++
 ld/ldgram.y  | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a2fb4a4..1fb55c7 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-04  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* ldgram.y: Rename file_NAME_list to section_NAME_list
+	throughout.
+
 2016-11-01  Palmer Dabbelt  <palmer@dabbelt.com>
 	    Andrew Waterman <andrew@sifive.com>
 
diff --git a/ld/ldgram.y b/ld/ldgram.y
index 9973b07..b99d511 100644
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -92,7 +92,7 @@ static int error_index;
 %type <etree> opt_exp_without_type opt_subalign opt_align
 %type <fill> fill_opt fill_exp
 %type <name_list> exclude_name_list
-%type <wildcard_list> file_NAME_list
+%type <wildcard_list> section_NAME_list
 %type <flag_info_list> sect_flag_list
 %type <flag_info> sect_flags
 %type <name> memspec_opt casesymlist
@@ -596,8 +596,8 @@ exclude_name_list:
 			}
 	;
 
-file_NAME_list:
-		file_NAME_list opt_comma wildcard_spec
+section_NAME_list:
+		section_NAME_list opt_comma wildcard_spec
 			{
 			  struct wildcard_list *tmp;
 			  tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
@@ -635,11 +635,11 @@ input_section_spec_no_keep:
 			  tmp.section_flag_list = $1;
 			  lang_add_wild (&tmp, NULL, ldgram_had_keep);
 			}
-        |	'[' file_NAME_list ']'
+        |	'[' section_NAME_list ']'
 			{
 			  lang_add_wild (NULL, $2, ldgram_had_keep);
 			}
-        |	sect_flags '[' file_NAME_list ']'
+        |	sect_flags '[' section_NAME_list ']'
 			{
 			  struct wildcard_spec tmp;
 			  tmp.name = NULL;
@@ -648,11 +648,11 @@ input_section_spec_no_keep:
 			  tmp.section_flag_list = $1;
 			  lang_add_wild (&tmp, $3, ldgram_had_keep);
 			}
-	|	wildcard_spec '(' file_NAME_list ')'
+	|	wildcard_spec '(' section_NAME_list ')'
 			{
 			  lang_add_wild (&$1, $3, ldgram_had_keep);
 			}
-	|	sect_flags wildcard_spec '(' file_NAME_list ')'
+	|	sect_flags wildcard_spec '(' section_NAME_list ')'
 			{
 			  $2.section_flag_list = $1;
 			  lang_add_wild (&$2, $4, ldgram_had_keep);
-- 
2.7.4