From e06cae3665e66c3122d133939a76e25fd519ae26 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 5 Jun 2000 16:16:31 +0000 Subject: [PATCH] 2000-06-05 Michael Matz * ldgram.y (vers_defns): Handle 'extern "C++" { ... }' in version scripts. * ldlex.l (V_IDENTIFIER): Accept `::' in symbols. --- ld/ChangeLog | 7 +++++++ ld/ldgram.y | 1 + ld/ldlex.l | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 43684b4ee2e..fdaa3945562 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2000-06-05 Michael Matz + + * ldgram.y (vers_defns): Handle 'extern "C++" { ... }' in + version scripts. + + * ldlex.l (V_IDENTIFIER): Accept `::' in symbols. + 2000-05-23 Marek Michalkiewicz * emulparams/avr1200.sh (STACK): Define as 0. diff --git a/ld/ldgram.y b/ld/ldgram.y index 806ea1c5f5c..375eb913da7 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -1113,6 +1113,7 @@ vers_defns: } vers_defns '}' { + $$ = $5; ldgram_vers_current_lang = $4; } ; diff --git a/ld/ldlex.l b/ld/ldlex.l index 2eef80f1fe2..4dfa53f7a4d 100644 --- a/ld/ldlex.l +++ b/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 -- 2.30.2