PR ld/10515

[binutils-gdb.git] / gold / dynobj.cc

diff --git a/gold/dynobj.cc b/gold/dynobj.cc
index 349d472417ff0a20d1e015d54d8bd9be6cb6862e..df2afeb319701794092d9f7bd5ae13b179045dbe 100644 (file)
--- a/gold/dynobj.cc
+++ b/gold/dynobj.cc
@@ -83,13 +83,9 @@ Sized_dynobj<size, big_endian>::Sized_dynobj(
 
 template<int size, bool big_endian>
 void
-Sized_dynobj<size, big_endian>::setup(
-    const elfcpp::Ehdr<size, big_endian>& ehdr)
+Sized_dynobj<size, big_endian>::setup(Target *target)
 {
-  this->set_target(ehdr.get_e_machine(), size, big_endian,
-                  ehdr.get_e_ident()[elfcpp::EI_OSABI],
-                  ehdr.get_e_ident()[elfcpp::EI_ABIVERSION]);
-
+  this->set_target(target);
   const unsigned int shnum = this->elf_file_.shnum();
   this->set_shnum(shnum);
 }
@@ -655,7 +651,8 @@ Sized_dynobj<size, big_endian>::make_version_map(
 template<int size, bool big_endian>
 void
 Sized_dynobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
-                                              Read_symbols_data* sd)
+                                              Read_symbols_data* sd,
+                                              Layout*)
 {
   if (sd->symbols == NULL)
     {
@@ -1305,12 +1302,9 @@ Versions::Versions(const Version_script_info& version_script,
   : defs_(), needs_(), version_table_(),
     is_finalized_(false), version_script_(version_script)
 {
-  // We always need a base version, so define that first. Nothing
+  // We always need a base version, so define that first.  Nothing
   // explicitly declares itself as part of base, so it doesn't need to
   // be in version_table_.
-  // FIXME: Should use soname here when creating a shared object. Is
-  // this fixme still valid? It looks like it's doing the right thing
-  // to me.
   if (parameters->options().shared())
     {
       const char* name = parameters->options().soname();