* dynobj.cc (Versions::Versions): If there is an soname, use it as

the base version name.
This commit is contained in:
Ian Lance Taylor 2008-07-24 07:26:27 +00:00
parent 81fd73edd1
commit aa86f06bb6
2 changed files with 7 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2008-07-24 Ian Lance Taylor <iant@google.com> 2008-07-24 Ian Lance Taylor <iant@google.com>
* dynobj.cc (Versions::Versions): If there is an soname, use it as
the base version name.
* stringpool.cc (Stringpool_template::add_with_length): Set key to * stringpool.cc (Stringpool_template::add_with_length): Set key to
array size plus one. array size plus one.
(Stringpool_template::set_string_offsets): Subtract one from key (Stringpool_template::set_string_offsets): Subtract one from key

View File

@ -1313,8 +1313,10 @@ Versions::Versions(const Version_script_info& version_script,
// to me. // to me.
if (parameters->options().shared()) if (parameters->options().shared())
{ {
const char* name = dynpool->add(parameters->options().output_file_name(), const char* name = parameters->options().soname();
false, NULL); if (name == NULL)
name = parameters->options().output_file_name();
name = dynpool->add(name, false, NULL);
Verdef* vdbase = new Verdef(name, std::vector<std::string>(), Verdef* vdbase = new Verdef(name, std::vector<std::string>(),
true, false, true); true, false, true);
this->defs_.push_back(vdbase); this->defs_.push_back(vdbase);