aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/symtab.cc4
2 files changed, 9 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index f216595..9b56527 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-27 Viktor Kutuzov <vkutuzov@accesssoftek.com>
+ Ian Lance Taylor <iant@google.com>
+
+ * symtab.cc (Symbol_table::define_special_symbol): Always
+ canonicalize version string.
+
2011-09-26 Cary Coutant <ccoutant@google.com>
* gold/gold.cc (queue_initial_tasks): Move option checks ...
diff --git a/gold/symtab.cc b/gold/symtab.cc
index ff6ff84..ff1b5ca 100644
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -1683,7 +1683,9 @@ Symbol_table::define_special_symbol(const char** pname, const char** pversion,
return NULL;
*pname = oldsym->name();
- if (!is_default_version)
+ if (is_default_version)
+ *pversion = this->namepool_.add(*pversion, true, NULL);
+ else
*pversion = oldsym->version();
}
else