From: Craig Silverstein <csilvers@google.com>
Date: Mon, 30 Jun 2008 20:59:54 +0000 (+0000)
Subject: 2008-06-30  Craig Silverstein  <csilvers@cs.stanford.edu>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=afe47622714cc973b1fe04ca27d460cfc1c29d90;p=binutils-gdb.git

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 168f9c47462..d73e1cd9d88 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 4b2c3379f2b..55cd4e60ff5 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 e9106102d46..3b7d1b6fef3 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*;