aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/script.cc4
-rw-r--r--gold/testsuite/version_script.map2
3 files changed, 9 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 168f9c4..d73e1cd 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-30 Craig Silverstein <csilvers@cs.stanford.edu>
+
+ * script.cc (Lex::can_continue_name): Make '?' allowable in
+ version-script names.
+ * testsuite/version_script.map: Change glob pattern to use '?'
+
2008-06-30 Manish Singh <yosh@gimp.org>
PR 6585
diff --git a/gold/script.cc b/gold/script.cc
index 4b2c337..55cd4e6 100644
--- a/gold/script.cc
+++ b/gold/script.cc
@@ -431,12 +431,12 @@ Lex::can_continue_name(const char* c)
case '/': case '\\': case '~':
case '=': case '+':
- case ',': case '?':
+ case ',':
if (this->mode_ == LINKER_SCRIPT)
return c + 1;
return NULL;
- case '[': case ']': case '*': case '-':
+ case '[': case ']': case '*': case '?': case '-':
if (this->mode_ == LINKER_SCRIPT || this->mode_ == VERSION_SCRIPT)
return c + 1;
return NULL;
diff --git a/gold/testsuite/version_script.map b/gold/testsuite/version_script.map
index e910610..3b7d1b6f 100644
--- a/gold/testsuite/version_script.map
+++ b/gold/testsuite/version_script.map
@@ -17,7 +17,7 @@ V1 {
SECTIONS;
sizeof_headers;
# Crazy globbiness
- glob*f[^A-Zo]stuff;
+ glob*f[^A-Zo]st?ff;
local:
*foo*;