2000-06-05 Michael Matz <matz@ifh.de>

* ldgram.y (vers_defns): Handle 'extern "C++" { ... }' in
	 version scripts.

	 * ldlex.l (V_IDENTIFIER): Accept `::' in symbols.

ld/ChangeLog

@@ -1,3 +1,10 @@
+2000-06-05  Michael Matz <matz@ifh.de>
+
+	* ldgram.y (vers_defns): Handle 'extern "C++" { ... }' in
+	 version scripts.
+
+	 * ldlex.l (V_IDENTIFIER): Accept `::' in symbols.
+
 2000-05-23  Marek Michalkiewicz  <marekm@linux.org.pl>
 
 	* emulparams/avr1200.sh (STACK): Define as 0.

ld/ldgram.y

@@ -1113,6 +1113,7 @@ vers_defns:
 			}
 		vers_defns '}'
 			{
+			  $$ = $5;
 			  ldgram_vers_current_lang = $<name>4;
 			}
 	;

ld/ldlex.l

@@ -115,7 +115,7 @@ WHITE		[ \t\n\r]+
 NOCFILENAMECHAR	[_a-zA-Z0-9\/\.\-\_\+\$\:\[\]\\\~]
 
 V_TAG [.$_a-zA-Z][._a-zA-Z0-9]*
-V_IDENTIFIER [*?.$_a-zA-Z][*?.$_a-zA-Z0-9]*
+V_IDENTIFIER [*?.$_a-zA-Z]([*?.$_a-zA-Z0-9]|::)*
 
 %s SCRIPT
 %s EXPRESSION