From 95d14cd31e8c12b180adeba4aa840250004ca534 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 23 Jul 2008 14:36:09 +0000
Subject: 	* symtab.cc (Symbol_table::resolve): Remove version parameter.
 	Change all callers. 	* symtab.h (class Symbol_table): Update
 declaration. 	* testsuite/ver_test_9.cc: New file. 	*
 testsuite/Makefile.am (check_PROGRAMS): Add ver_test_9. 
 (ver_test_9_SOURCES, ver_test_9_DEPENDENCIES): Define. 
 (ver_test_9_LDFLAGS, ver_test_9_LDADD): Define. 	(ver_test_9.so,
 ver_test_9.o): New targets. 	* testsuite/Makefile.in: Rebuild.

---
 gold/symtab.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'gold/symtab.cc')

diff --git a/gold/symtab.cc b/gold/symtab.cc
index 03e592e..e3b0d9d 100644
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -489,8 +489,7 @@ Symbol_table::lookup(const char* name, const char* version) const
 
 template<int size, bool big_endian>
 void
-Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from,
-		      const char* version)
+Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from)
 {
   unsigned char buf[elfcpp::Elf_sizes<size>::sym_size];
   elfcpp::Sym_write<size, big_endian> esym(buf);
@@ -502,7 +501,7 @@ Symbol_table::resolve(Sized_symbol<size>* to, const Sized_symbol<size>* from,
   bool is_ordinary;
   unsigned int shndx = from->shndx(&is_ordinary);
   this->resolve(to, esym.sym(), shndx, is_ordinary, shndx, from->object(),
-		version);
+		from->version());
   if (from->in_reg())
     to->set_in_reg();
   if (from->in_dyn())
@@ -735,7 +734,7 @@ Symbol_table::add_from_object(Object* object,
 		{
 		  const Sized_symbol<size>* sym2;
 		  sym2 = this->get_sized_symbol<size>(insdef.first->second);
-		  Symbol_table::resolve<size, big_endian>(ret, sym2, version);
+		  Symbol_table::resolve<size, big_endian>(ret, sym2);
 		  this->make_forwarder(insdef.first->second, ret);
 		  insdef.first->second = ret;
 		}
-- 
cgit v1.1