From afe47622714cc973b1fe04ca27d460cfc1c29d90 Mon Sep 17 00:00:00 2001 From: Craig Silverstein Date: Mon, 30 Jun 2008 20:59:54 +0000 Subject: [PATCH] 2008-06-30 Craig Silverstein * script.cc (Lex::can_continue_name): Make '?' allowable in version-script names. * testsuite/version_script.map: Change glob pattern to use '?' --- gold/ChangeLog | 6 ++++++ gold/script.cc | 4 ++-- gold/testsuite/version_script.map | 2 +- 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 + + * 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 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*; -- 2.7.4