diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/ldgram.y | 1 | ||||
| -rw-r--r-- | ld/ldlex.l | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 43684b4..fdaa394 100644 --- a/ld/ChangeLog +++ b/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. diff --git a/ld/ldgram.y b/ld/ldgram.y index 806ea1c..375eb91 100644 --- a/ld/ldgram.y +++ b/ld/ldgram.y @@ -1113,6 +1113,7 @@ vers_defns: } vers_defns '}' { + $$ = $5; ldgram_vers_current_lang = $<name>4; } ; @@ -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 |