summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/ldlex.l2
2 files changed, 6 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index be5ee3e042..9cf54fdaf3 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,10 @@
2010-08-31 Nick Clifton <nickc@redhat.com>
+ * ldlex.l (WILDCHAR): Add the caret and exclamation point
+ characters, so that they can be used inside regexps.
+
+2010-08-31 Nick Clifton <nickc@redhat.com>
+
* ld.texinfo (MEMORY): Clarify the behaviour of the ! character in
a region's attributes.
diff --git a/ld/ldlex.l b/ld/ldlex.l
index e52d83b222..7f038b32a4 100644
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -99,7 +99,7 @@ CMDFILENAMECHAR1 [_a-zA-Z0-9\/\.\\_\+\$\:\[\]\\\,\=\&\!\<\>\~]
FILENAMECHAR1 [_a-zA-Z\/\.\\\$\_\~]
SYMBOLCHARN [_a-zA-Z\/\.\\\$\_\~0-9]
FILENAMECHAR [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\\,\~]
-WILDCHAR [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\\,\~\?\*]
+WILDCHAR [_a-zA-Z0-9\/\.\-\_\+\=\$\:\[\]\\\,\~\?\*\^\!]
WHITE [ \t\n\r]+
NOCFILENAMECHAR [_a-zA-Z0-9\/\.\-\_\+\$\:\[\]\\\~]