aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2000-06-05 16:16:31 +0000
committerH.J. Lu <hjl.tools@gmail.com>2000-06-05 16:16:31 +0000
commite06cae3665e66c3122d133939a76e25fd519ae26 (patch)
tree57a26dd0d92f8199150823f3b853d8adb8382a4d
parent26099b4aa4e4a340391754c95820bfa19f8f0e1c (diff)
downloadgdb-e06cae3665e66c3122d133939a76e25fd519ae26.zip
gdb-e06cae3665e66c3122d133939a76e25fd519ae26.tar.gz
gdb-e06cae3665e66c3122d133939a76e25fd519ae26.tar.bz2
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.
-rw-r--r--ld/ChangeLog7
-rw-r--r--ld/ldgram.y1
-rw-r--r--ld/ldlex.l2
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;
}
;
diff --git a/ld/ldlex.l b/ld/ldlex.l
index 2eef80f..4dfa53f 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