From 8e23b15d1cd68862503d11996be661999b8584c0 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 20 Feb 2003 01:02:39 +0000
Subject: [PATCH] 	* ldgram.y (vers_defns): Also recurse with 'EXTERN
 NAME' patterns. 	* ldgram.y (vers_defns): Allow optional trailing
 semicolon in 	EXTERN NAME block;

---
 ld/ChangeLog |  9 +++++++++
 ld/ldgram.y  | 17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index eab0eed713..e13943af12 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2003-02-20  Phil Edwards  <pme@gcc.gnu.org>
+
+	* ldgram.y (vers_defns): Also recurse with 'EXTERN NAME' patterns.
+
+2003-02-20  Harri Porten  <porten@kde.org>
+
+	* ldgram.y (vers_defns): Allow optional trailing semicolon in
+	EXTERN NAME block;
+
 2003-02-18  Alan Modra  <amodra@bigpond.net.au>
 
 	* emultempl/ppc32elf.em: New file.
diff --git a/ld/ldgram.y b/ld/ldgram.y
index 5904accce6..fadc3e534e 100644
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -1130,18 +1130,33 @@ vers_defns:
 		{
 		  $$ = lang_new_vers_pattern ($1, $3, ldgram_vers_current_lang);
 		}
+	|	vers_defns ';' EXTERN NAME '{'
+			{
+			  $<name>$ = ldgram_vers_current_lang;
+			  ldgram_vers_current_lang = $4;
+			}
+		vers_defns opt_semicolon '}'
+			{
+			  $$ = $7;
+			  ldgram_vers_current_lang = $<name>6;
+			}
 	|	EXTERN NAME '{'
 			{
 			  $<name>$ = ldgram_vers_current_lang;
 			  ldgram_vers_current_lang = $2;
 			}
-		vers_defns '}'
+		vers_defns opt_semicolon '}'
 			{
 			  $$ = $5;
 			  ldgram_vers_current_lang = $<name>4;
 			}
 	;
 
+opt_semicolon:
+		/* empty */
+	|	';'
+	;
+
 %%
 void
 yyerror(arg) 
-- 
2.34.1