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 '?'

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 168f9c474624fb5a8a3a1874f0059899bd522219..d73e1cd9d889bcfddd2a70d7ad1da9bc7fb2b021 100644 (file)
--- 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 4b2c3379f2b288955a136cdc2266ef2c7164830b..55cd4e60ff5ebd093994a2ded864698b26babae0 100644 (file)
--- 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 e9106102d46047eab237b738d3fc4c53e9801f27..3b7d1b6fef312279413eba5f417ba9b51a0b6def 100644 (file)
--- 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*;