[MIPS] Initial checkin for MIPS changes for GOLD.

gold/symtab.cc

 // symtab.cc -- the gold symbol table
 
 // Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 3 of the License, or
@@ skipping 509 matching lines @@
     }
 }
 
 // Class Symbol_table.
 
 Symbol_table::Symbol_table(unsigned int count,
                            const Version_script_info& version_script)
   : saw_undefined_(0), offset_(0), table_(count), namepool_(),
     forwarders_(), commons_(), tls_commons_(), small_commons_(),
     large_commons_(), forced_locals_(), warnings_(),
-    version_script_(version_script), gc_(NULL), icf_(NULL)
+    version_script_(version_script), gc_(NULL), icf_(NULL),
+    global_got_index_((unsigned int)-1)
 {
   namepool_.reserve(count);
 }
 
 Symbol_table::~Symbol_table()
 {
 }
 
 // The symbol table key equality function.  This is called with
 // Stringpool keys.
@@ skipping 1805 matching lines @@
 #endif
     }
 
   gold_assert(oldsym == NULL);
 
   sym->init_undefined(name, version, elfcpp::STT_NOTYPE, elfcpp::STB_GLOBAL,
                       elfcpp::STV_DEFAULT, 0);
   ++this->saw_undefined_;
 }
 
+bool got_offset_compare(Symbol *sym1, Symbol *sym2)

[robertm, 2012/04/27 19:46:15]

the convention seems to be to move "*" to the left when
used in a type

[Aleksandar Simeonov, 2012/05/08 15:21:42]

Will be done.

+{
+  return sym1->got_offset(0) < sym2->got_offset(0);
+}
+
 // Set the dynamic symbol indexes.  INDEX is the index of the first
 // global dynamic symbol.  Pointers to the symbols are stored into the
 // vector SYMS.  The names are added to DYNPOOL.  This returns an
 // updated dynamic symbol index.
 
 unsigned int
 Symbol_table::set_dynsym_indexes(unsigned int index,
                                  std::vector<Symbol*>* syms,
                                  Stringpool* dynpool,
                                  Versions* versions)
 {
+  std::vector<Symbol *> externals;

[robertm, 2012/04/27 19:46:15]

are these change specific to MIPS - if yes explain why.

[Aleksandar Simeonov, 2012/05/08 15:21:42]

The dynamic symbol table is divided into local and global parts.  The global
part of the dynamic symbol table is further divided into two parts: symbols that
do not have GOT entries associated with them and symbols that do have GOT
entries associated with them.

+  int i;
+
   for (Symbol_table_type::iterator p = this->table_.begin();
        p != this->table_.end();
        ++p)
     {
       Symbol* sym = p->second;
 
       // Note that SYM may already have a dynamic symbol index, since
       // some symbols appear more than once in the symbol table, with
       // and without a version.
 
       if (!sym->should_add_dynsym_entry(this))
         sym->set_dynsym_index(-1U);
-      else if (!sym->has_dynsym_index())
+      else if((!sym->has_dynsym_index() && sym->has_got_offset(0))

[robertm, 2012/04/27 19:46:15]

This condition is complex enough that it might be better to move it into its own
function, e.g.

some-meaningful-name(sym, is_pie)

+        && (!sym->final_value_is_known()
+        || (parameters->options().output_is_position_independent())))
+        {
+          externals.push_back(sym);
+        }
+      else if(!sym->has_dynsym_index())
         {
           sym->set_dynsym_index(index);
           ++index;
           syms->push_back(sym);
           dynpool->add(sym->name(), false, NULL);
 
           // Record any version information.
           if (sym->version() != NULL)
             versions->record_version(this, dynpool, sym);
 
           // If the symbol is defined in a dynamic object and is
           // referenced in a regular object, then mark the dynamic
           // object as needed.  This is used to implement --as-needed.
           if (sym->is_from_dynobj() && sym->in_reg())
             sym->object()->set_is_needed();
         }
     }
 
-  // Finish up the versions.  In some cases this may add new dynamic
-  // symbols.
+  // At the end of dynamic symbol table place global symbols that has
+  // .got entry.
+  std::sort(externals.begin(), externals.end(), got_offset_compare);

[robertm, 2012/04/27 19:46:15]

mention all the extra work you do here in the function comment

[Aleksandar Simeonov, 2012/05/08 15:21:42]

Will be done.

+  for(i = 0; (unsigned int)i < externals.size(); i++)
+  {
+    Symbol* sym = externals[i];
+
+    if(sym->has_dynsym_index())
+      continue;
+
+    // Record any version information.
+    if (sym->version() != NULL)
+      versions->record_version(this, dynpool, sym);
+  }
+
   index = versions->finalize(this, index, syms);
 
+  // Set index of the first external symbol that has .got entry.
+  this->global_got_index_ = index;
+
+  for(i = 0; (unsigned int)i < externals.size(); i++)
+  {
+    Symbol* sym = externals[i];
+
+    if(sym->has_dynsym_index())
+      continue;
+
+    sym->set_dynsym_index(index);
+    ++index;
+    syms->push_back(sym);
+    dynpool->add(sym->name(), false, NULL);
+
+    // If the symbol is defined in a dynamic object and is
+    // referenced in a regular object, then mark the dynamic
+    // object as needed.  This is used to implement --as-needed.
+    if (sym->is_from_dynobj() && sym->in_reg())
+      sym->object()->set_is_needed();
+  }
+
+  // If there are no global symbols with .got entry set value to -1.
+  if(this->global_got_index_ == index)
+    this->global_got_index_ = (unsigned int)-1;
+
   return index;
 }
 
 // Set the final values for all the symbols.  The index of the first
 // global symbol in the output file is *PLOCAL_SYMCOUNT.  Record the
 // file offset OFF.  Add their names to POOL.  Return the new file
 // offset.  Update *PLOCAL_SYMCOUNT if necessary.
 
 off_t
 Symbol_table::finalize(off_t off, off_t dynoff, size_t dyn_global_index,
@@ skipping 1161 matching lines @@
 
 #if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
 template
 void
 Symbol_table::define_with_copy_reloc<64>(
     Sized_symbol<64>* sym,
     Output_data* posd,
     elfcpp::Elf_types<64>::Elf_Addr value);
 #endif
 
+#if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
+template
+void
+Sized_symbol<32>::init_output_data(const char* name, const char* version,
+                                     Output_data* od, Value_type value,

[robertm, 2012/04/27 19:46:15]

indentation is off, also convention seems to be one param per line

[Aleksandar Simeonov, 2012/05/08 15:21:42]

It is not sure what is convention since before these declarations one standard
is used and after completely different.
We can change it though.

+                                     Size_type symsize, elfcpp::STT type,
+                                     elfcpp::STB binding,
+                                     elfcpp::STV visibility,
+                                     unsigned char nonvis,
+                                     bool offset_is_from_end,
+                                     bool is_predefined);
+#endif
+
+#if defined(HAVE_TARGET_64_LITTLE) || defined(HAVE_TARGET_64_BIG)
+template
+void
+Sized_symbol<64>::init_output_data(const char* name, const char* version,
+                                     Output_data* od, Value_type value,

[robertm, 2012/04/27 19:46:15]

here too

[Aleksandar Simeonov, 2012/05/08 15:21:42]

Same as above.

+                                     Size_type symsize, elfcpp::STT type,
+                                     elfcpp::STB binding,
+                                     elfcpp::STV visibility,
+                                     unsigned char nonvis,
+                                     bool offset_is_from_end,
+                                     bool is_predefined);
+#endif
+
 #ifdef HAVE_TARGET_32_LITTLE
 template
 void
 Warnings::issue_warning<32, false>(const Symbol* sym,
                                    const Relocate_info<32, false>* relinfo,
                                    size_t relnum, off_t reloffset) const;
 #endif
 
 #ifdef HAVE_TARGET_32_BIG
 template
@@ skipping 13 matching lines @@
 
 #ifdef HAVE_TARGET_64_BIG
 template
 void
 Warnings::issue_warning<64, true>(const Symbol* sym,
                                   const Relocate_info<64, true>* relinfo,
                                   size_t relnum, off_t reloffset) const;
 #endif
 
 } // End namespace gold.