2007-09-08 H.J. Lu <hongjiu.lu@intel.com>
[deliverable/binutils-gdb.git] / gold / layout.cc
index d91f73105d2e9a619e367f2ae469f33112962bff..d533722687569d7c71a3d4c4d642af0fdf78b134 100644 (file)
@@ -2,75 +2,56 @@
 
 #include "gold.h"
 
-#include <cassert>
 #include <cstring>
 #include <algorithm>
 #include <iostream>
 #include <utility>
 
 #include "output.h"
+#include "symtab.h"
+#include "dynobj.h"
 #include "layout.h"
 
 namespace gold
 {
 
-// Layout_task methods.
-
-Layout_task::~Layout_task()
-{
-}
-
-// This task can be run when it is unblocked.
-
-Task::Is_runnable_type
-Layout_task::is_runnable(Workqueue*)
-{
-  if (this->this_blocker_->is_blocked())
-    return IS_BLOCKED;
-  return IS_RUNNABLE;
-}
-
-// We don't need to hold any locks for the duration of this task.  In
-// fact this task will be the only one running.
-
-Task_locker*
-Layout_task::locks(Workqueue*)
-{
-  return NULL;
-}
+// Layout_task_runner methods.
 
 // Lay out the sections.  This is called after all the input objects
 // have been read.
 
 void
-Layout_task::run(Workqueue*)
+Layout_task_runner::run(Workqueue* workqueue)
 {
-  Layout layout(this->options_);
-  layout.init();
-  for (Input_objects::Object_list::const_iterator p =
-        this->input_objects_->begin();
-       p != this->input_objects_->end();
-       ++p)
-    (*p)->layout(&layout);
-  layout.finalize(this->input_objects_, this->symtab_);
-}
+  off_t file_size = this->layout_->finalize(this->input_objects_,
+                                           this->symtab_);
 
-// Layout methods.
+  // Now we know the final size of the output file and we know where
+  // each piece of information goes.
+  Output_file* of = new Output_file(this->options_);
+  of->open(file_size);
 
-Layout::Layout(const General_options& options)
-  : options_(options), namepool_(), sympool_(), signatures_(),
-    section_name_map_(), segment_list_(), section_list_()
-{
+  // Queue up the final set of tasks.
+  gold::queue_final_tasks(this->options_, this->input_objects_,
+                         this->symtab_, this->layout_, workqueue, of);
 }
 
-// Prepare for doing layout.
+// Layout methods.
 
-void
-Layout::init()
+Layout::Layout(const General_options& options)
+  : options_(options), namepool_(), sympool_(), dynpool_(), signatures_(),
+    section_name_map_(), segment_list_(), section_list_(),
+    unattached_section_list_(), special_output_list_(),
+    tls_segment_(NULL), symtab_section_(NULL),
+    dynsym_section_(NULL), dynamic_section_(NULL), dynamic_data_(NULL)
 {
   // Make space for more than enough segments for a typical file.
   // This is just for efficiency--it's OK if we wind up needing more.
-  segment_list_.reserve(12);
+  this->segment_list_.reserve(12);
+
+  // We expect three unattached Output_data objects: the file header,
+  // the segment headers, and the section headers.
+  this->special_output_list_.reserve(3);
 }
 
 // Hash a key we use to look up an output section mapping.
@@ -78,7 +59,7 @@ Layout::init()
 size_t
 Layout::Hash_key::operator()(const Layout::Key& k) const
 {
- return reinterpret_cast<size_t>(k.first) + k.second.first + k.second.second;
+ return k.first + k.second.first + k.second.second;
 }
 
 // Whether to include this section in the link.
@@ -112,62 +93,119 @@ Layout::include_section(Object*, const char*,
     }
 }
 
-// Return the output section to use for input section NAME, with
-// header HEADER, from object OBJECT.  Set *OFF to the offset of this
-// input section without the output section.
+// Return an output section named NAME, or NULL if there is none.
 
-template<int size, bool big_endian>
 Output_section*
-Layout::layout(Object* object, const char* name,
-              const elfcpp::Shdr<size, big_endian>& shdr, off_t* off)
+Layout::find_output_section(const char* name) const
 {
-  if (!this->include_section(object, name, shdr))
-    return NULL;
-
-  // Unless we are doing a relocateable link, .gnu.linkonce sections
-  // are laid out as though they were named for the sections are
-  // placed into.
-  if (!this->options_.is_relocatable() && Layout::is_linkonce(name))
-    name = Layout::linkonce_output_name(name);
-
-  // FIXME: Handle SHF_OS_NONCONFORMING here.
+  for (Section_name_map::const_iterator p = this->section_name_map_.begin();
+       p != this->section_name_map_.end();
+       ++p)
+    if (strcmp(p->second->name(), name) == 0)
+      return p->second;
+  return NULL;
+}
 
-  // Canonicalize the section name.
-  name = this->namepool_.add(name);
+// Return an output segment of type TYPE, with segment flags SET set
+// and segment flags CLEAR clear.  Return NULL if there is none.
 
-  // Find the output section.  The output section is selected based on
-  // the section name, type, and flags.
+Output_segment*
+Layout::find_output_segment(elfcpp::PT type, elfcpp::Elf_Word set,
+                           elfcpp::Elf_Word clear) const
+{
+  for (Segment_list::const_iterator p = this->segment_list_.begin();
+       p != this->segment_list_.end();
+       ++p)
+    if (static_cast<elfcpp::PT>((*p)->type()) == type
+       && ((*p)->flags() & set) == set
+       && ((*p)->flags() & clear) == 0)
+      return *p;
+  return NULL;
+}
 
-  // FIXME: If we want to do relaxation, we need to modify this
-  // algorithm.  We also build a list of input sections for each
-  // output section.  Then we relax all the input sections.  Then we
-  // walk down the list and adjust all the offsets.
+// Return the output section to use for section NAME with type TYPE
+// and section flags FLAGS.
 
-  elfcpp::Elf_Word type = shdr.get_sh_type();
-  elfcpp::Elf_Xword flags = shdr.get_sh_flags();
-  const Key key(name, std::make_pair(type, flags));
+Output_section*
+Layout::get_output_section(const char* name, Stringpool::Key name_key,
+                          elfcpp::Elf_Word type, elfcpp::Elf_Xword flags)
+{
+  // We should ignore some flags.
+  flags &= ~ (elfcpp::SHF_INFO_LINK
+             | elfcpp::SHF_LINK_ORDER
+             | elfcpp::SHF_GROUP
+             | elfcpp::SHF_MERGE
+             | elfcpp::SHF_STRINGS);
+
+  const Key key(name_key, std::make_pair(type, flags));
   const std::pair<Key, Output_section*> v(key, NULL);
   std::pair<Section_name_map::iterator, bool> ins(
     this->section_name_map_.insert(v));
 
-  Output_section* os;
   if (!ins.second)
-    os = ins.first->second;
+    return ins.first->second;
   else
     {
       // This is the first time we've seen this name/type/flags
       // combination.
-      os = this->make_output_section(name, type, flags);
+      Output_section* os = this->make_output_section(name, type, flags);
       ins.first->second = os;
+      return os;
     }
+}
+
+// Return the output section to use for input section SHNDX, with name
+// NAME, with header HEADER, from object OBJECT.  Set *OFF to the
+// offset of this input section without the output section.
+
+template<int size, bool big_endian>
+Output_section*
+Layout::layout(Relobj* object, unsigned int shndx, const char* name,
+              const elfcpp::Shdr<size, big_endian>& shdr, off_t* off)
+{
+  if (!this->include_section(object, name, shdr))
+    return NULL;
+
+  // If we are not doing a relocateable link, choose the name to use
+  // for the output section.
+  size_t len = strlen(name);
+  if (!this->options_.is_relocatable())
+    name = Layout::output_section_name(name, &len);
+
+  // FIXME: Handle SHF_OS_NONCONFORMING here.
+
+  // Canonicalize the section name.
+  Stringpool::Key name_key;
+  name = this->namepool_.add(name, len, &name_key);
+
+  // Find the output section.  The output section is selected based on
+  // the section name, type, and flags.
+  Output_section* os = this->get_output_section(name, name_key,
+                                               shdr.get_sh_type(),
+                                               shdr.get_sh_flags());
 
   // FIXME: Handle SHF_LINK_ORDER somewhere.
 
-  *off = os->add_input_section(object, name, shdr);
+  *off = os->add_input_section(object, shndx, name, shdr);
 
   return os;
 }
 
+// Add POSD to an output section using NAME, TYPE, and FLAGS.
+
+void
+Layout::add_output_section_data(const char* name, elfcpp::Elf_Word type,
+                               elfcpp::Elf_Xword flags,
+                               Output_section_data* posd)
+{
+  // Canonicalize the name.
+  Stringpool::Key name_key;
+  name = this->namepool_.add(name, &name_key);
+
+  Output_section* os = this->get_output_section(name, name_key, type, flags);
+  os->add_output_section_data(posd);
+}
+
 // Map section flags to segment flags.
 
 elfcpp::Elf_Word
@@ -189,9 +227,10 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
                            elfcpp::Elf_Xword flags)
 {
   Output_section* os = new Output_section(name, type, flags);
+  this->section_list_.push_back(os);
 
   if ((flags & elfcpp::SHF_ALLOC) == 0)
-    this->section_list_.push_back(os);
+    this->unattached_section_list_.push_back(os);
   else
     {
       // This output section goes into a PT_LOAD segment.
@@ -253,36 +292,49 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
        }
 
       // If we see a loadable SHF_TLS section, we create a PT_TLS
-      // segment.
+      // segment.  There can only be one such segment.
       if ((flags & elfcpp::SHF_TLS) != 0)
        {
-         // See if we already have an equivalent PT_TLS segment.
-         for (p = this->segment_list_.begin();
-              p != segment_list_.end();
-              ++p)
-           {
-             if ((*p)->type() == elfcpp::PT_TLS
-                 && (((*p)->flags() & elfcpp::PF_W)
-                     == (seg_flags & elfcpp::PF_W)))
-               {
-                 (*p)->add_output_section(os, seg_flags);
-                 break;
-               }
-           }
-
-         if (p == this->segment_list_.end())
+         if (this->tls_segment_ == NULL)
            {
-             Output_segment* oseg = new Output_segment(elfcpp::PT_TLS,
-                                                       seg_flags);
-             this->segment_list_.push_back(oseg);
-             oseg->add_output_section(os, seg_flags);
+             this->tls_segment_ = new Output_segment(elfcpp::PT_TLS,
+                                                     seg_flags);
+             this->segment_list_.push_back(this->tls_segment_);
            }
+         this->tls_segment_->add_output_section(os, seg_flags);
        }
     }
 
   return os;
 }
 
+// Create the dynamic sections which are needed before we read the
+// relocs.
+
+void
+Layout::create_initial_dynamic_sections(const Input_objects* input_objects,
+                                       Symbol_table* symtab)
+{
+  if (!input_objects->any_dynamic())
+    return;
+
+  const char* dynamic_name = this->namepool_.add(".dynamic", NULL);
+  this->dynamic_section_ = this->make_output_section(dynamic_name,
+                                                    elfcpp::SHT_DYNAMIC,
+                                                    (elfcpp::SHF_ALLOC
+                                                     | elfcpp::SHF_WRITE));
+
+  symtab->define_in_output_data(input_objects->target(), "_DYNAMIC", NULL,
+                               this->dynamic_section_, 0, 0,
+                               elfcpp::STT_OBJECT, elfcpp::STB_LOCAL,
+                               elfcpp::STV_HIDDEN, 0, false, false);
+
+  this->dynamic_data_ =  new Output_data_dynamic(input_objects->target(),
+                                                &this->dynpool_);
+
+  this->dynamic_section_->add_output_section_data(this->dynamic_data_);
+}
+
 // Find the first read-only PT_LOAD segment, creating one if
 // necessary.
 
@@ -339,13 +391,47 @@ Layout::find_first_load_seg()
 off_t
 Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
 {
+  Target* const target = input_objects->target();
+  const int size = target->get_size();
+
+  target->finalize_sections(&this->options_, this);
+
+  Output_segment* phdr_seg = NULL;
   if (input_objects->any_dynamic())
     {
-      // If there are any dynamic objects in the link, then we need
-      // some additional segments: PT_PHDRS, PT_INTERP, and
-      // PT_DYNAMIC.  We also need to finalize the dynamic symbol
-      // table and create the dynamic hash table.
-      abort();
+      // There was a dynamic object in the link.  We need to create
+      // some information for the dynamic linker.
+
+      // Create the PT_PHDR segment which will hold the program
+      // headers.
+      phdr_seg = new Output_segment(elfcpp::PT_PHDR, elfcpp::PF_R);
+      this->segment_list_.push_back(phdr_seg);
+
+      // Create the dynamic symbol table, including the hash table.
+      Output_section* dynstr;
+      std::vector<Symbol*> dynamic_symbols;
+      unsigned int local_dynamic_count;
+      Versions versions;
+      this->create_dynamic_symtab(target, symtab, &dynstr,
+                                 &local_dynamic_count, &dynamic_symbols,
+                                 &versions);
+
+      // Create the .interp section to hold the name of the
+      // interpreter, and put it in a PT_INTERP segment.
+      this->create_interp(target);
+
+      // Finish the .dynamic section to hold the dynamic data, and put
+      // it in a PT_DYNAMIC segment.
+      this->finish_dynamic_section(input_objects, symtab);
+
+      // We should have added everything we need to the dynamic string
+      // table.
+      this->dynpool_.set_string_offsets();
+
+      // Create the version sections.  We can't do this until the
+      // dynamic string table is complete.
+      this->create_version_sections(target, &versions, local_dynamic_count,
+                                   dynamic_symbols, dynstr);
     }
 
   // FIXME: Handle PT_GNU_STACK.
@@ -353,44 +439,51 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
   Output_segment* load_seg = this->find_first_load_seg();
 
   // Lay out the segment headers.
-  int size = input_objects->target()->get_size();
+  bool big_endian = target->is_big_endian();
   Output_segment_headers* segment_headers;
-  segment_headers = new Output_segment_headers(size, this->segment_list_);
+  segment_headers = new Output_segment_headers(size, big_endian,
+                                              this->segment_list_);
   load_seg->add_initial_output_data(segment_headers);
-  // FIXME: Attach them to PT_PHDRS if necessary.
+  this->special_output_list_.push_back(segment_headers);
+  if (phdr_seg != NULL)
+    phdr_seg->add_initial_output_data(segment_headers);
 
   // Lay out the file header.
   Output_file_header* file_header;
   file_header = new Output_file_header(size,
+                                      big_endian,
                                       this->options_,
-                                      input_objects->target(),
+                                      target,
                                       symtab,
                                       segment_headers);
   load_seg->add_initial_output_data(file_header);
+  this->special_output_list_.push_back(file_header);
 
-  // Set the file offsets of all the segments.
-  off_t off = this->set_segment_offsets(input_objects->target(), load_seg);
+  // We set the output section indexes in set_segment_offsets and
+  // set_section_offsets.
+  unsigned int shndx = 1;
+
+  // Set the file offsets of all the segments, and all the sections
+  // they contain.
+  off_t off = this->set_segment_offsets(target, load_seg, &shndx);
 
   // Create the symbol table sections.
-  // FIXME: We don't need to do this if we are stripping symbols.
-  Output_section* osymtab;
-  Output_section* ostrtab;
-  this->create_symtab_sections(input_objects, symtab, &osymtab, &ostrtab);
+  this->create_symtab_sections(size, input_objects, symtab, &off);
 
   // Create the .shstrtab section.
   Output_section* shstrtab_section = this->create_shstrtab();
 
   // Set the file offsets of all the sections not associated with
   // segments.
-  off = this->set_section_offsets(off);
+  off = this->set_section_offsets(off, &shndx);
 
   // Create the section table header.
-  Output_section_headers* oshdrs = this->create_shdrs(size, off);
-  off += oshdrs->data_size();
+  Output_section_headers* oshdrs = this->create_shdrs(size, big_endian, &off);
 
   file_header->set_section_info(oshdrs, shstrtab_section);
 
   // Now we know exactly where everything goes in the output file.
+  Output_data::layout_complete();
 
   return off;
 }
@@ -410,7 +503,7 @@ Layout::segment_precedes(const Output_segment* seg1,
   // segment.  We simply make it always first.
   if (type1 == elfcpp::PT_PHDR)
     {
-      assert(type2 != elfcpp::PT_PHDR);
+      gold_assert(type2 != elfcpp::PT_PHDR);
       return true;
     }
   if (type2 == elfcpp::PT_PHDR)
@@ -420,7 +513,7 @@ Layout::segment_precedes(const Output_segment* seg1,
   // segment.  We simply make it always second.
   if (type1 == elfcpp::PT_INTERP)
     {
-      assert(type2 != elfcpp::PT_INTERP);
+      gold_assert(type2 != elfcpp::PT_INTERP);
       return true;
     }
   if (type2 == elfcpp::PT_INTERP)
@@ -432,6 +525,14 @@ Layout::segment_precedes(const Output_segment* seg1,
   if (type2 == elfcpp::PT_LOAD && type1 != elfcpp::PT_LOAD)
     return false;
 
+  // We put the PT_TLS segment last, because that is where the dynamic
+  // linker expects to find it (this is just for efficiency; other
+  // positions would also work correctly).
+  if (type1 == elfcpp::PT_TLS && type2 != elfcpp::PT_TLS)
+    return false;
+  if (type2 == elfcpp::PT_TLS && type1 != elfcpp::PT_TLS)
+    return true;
+
   const elfcpp::Elf_Word flags1 = seg1->flags();
   const elfcpp::Elf_Word flags2 = seg2->flags();
 
@@ -442,7 +543,7 @@ Layout::segment_precedes(const Output_segment* seg1,
     {
       if (type1 != type2)
        return type1 < type2;
-      assert(flags1 != flags2);
+      gold_assert(flags1 != flags2);
       return flags1 < flags2;
     }
 
@@ -467,16 +568,17 @@ Layout::segment_precedes(const Output_segment* seg1,
 
   uint64_t paddr1 = seg1->paddr();
   uint64_t paddr2 = seg2->paddr();
-  assert(paddr1 != paddr2);
+  gold_assert(paddr1 != paddr2);
   return paddr1 < paddr2;
 }
 
-// Set the file offsets of all the segments.  They have all been
-// created.  LOAD_SEG must be be laid out first.  Return the offset of
-// the data to follow.
+// Set the file offsets of all the segments, and all the sections they
+// contain.  They have all been created.  LOAD_SEG must be be laid out
+// first.  Return the offset of the data to follow.
 
 off_t
-Layout::set_segment_offsets(const Target* target, Output_segment* load_seg)
+Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
+                           unsigned int *pshndx)
 {
   // Sort them into the final order.
   std::sort(this->segment_list_.begin(), this->segment_list_.end(),
@@ -494,7 +596,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg)
       if ((*p)->type() == elfcpp::PT_LOAD)
        {
          if (load_seg != NULL && load_seg != *p)
-           abort();
+           gold_unreachable();
          load_seg = NULL;
 
          // If the last segment was readonly, and this one is not,
@@ -508,18 +610,23 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg)
 
          uint64_t aligned_addr = addr;
          uint64_t abi_pagesize = target->abi_pagesize();
+
+          // FIXME: This should depend on the -n and -N options.
+          (*p)->set_minimum_addralign(target->common_pagesize());
+
          if (was_readonly && ((*p)->flags() & elfcpp::PF_W) != 0)
            {
-             uint64_t align = (*p)->max_data_align();
+             uint64_t align = (*p)->addralign();
 
-             addr = (addr + align - 1) & ~ (align - 1);
+             addr = align_address(addr, align);
              aligned_addr = addr;
              if ((addr & (abi_pagesize - 1)) != 0)
                addr = addr + abi_pagesize;
            }
 
+         unsigned int shndx_hold = *pshndx;
          off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1));
-         uint64_t new_addr = (*p)->set_section_addresses(addr, &off);
+         uint64_t new_addr = (*p)->set_section_addresses(addr, &off, pshndx);
 
          // Now that we know the size of this segment, we may be able
          // to save a page in memory, at the cost of wasting some
@@ -540,10 +647,10 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg)
                      != (new_addr & ~ (common_pagesize - 1)))
                  && first_off + last_off <= common_pagesize)
                {
-                 addr = ((aligned_addr + common_pagesize - 1)
-                         & ~ (common_pagesize - 1));
+                 *pshndx = shndx_hold;
+                 addr = align_address(aligned_addr, common_pagesize);
                  off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1));
-                 new_addr = (*p)->set_section_addresses(addr, &off);
+                 new_addr = (*p)->set_section_addresses(addr, &off, pshndx);
                }
            }
 
@@ -571,42 +678,134 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg)
 // segment.
 
 off_t
-Layout::set_section_offsets(off_t off)
+Layout::set_section_offsets(off_t off, unsigned int* pshndx)
 {
-  for (Layout::Section_list::iterator p = this->section_list_.begin();
-       p != this->section_list_.end();
+  for (Section_list::iterator p = this->unattached_section_list_.begin();
+       p != this->unattached_section_list_.end();
        ++p)
     {
-      uint64_t addralign = (*p)->addralign();
-      off = (off + addralign - 1) & ~ (addralign - 1);
+      (*p)->set_out_shndx(*pshndx);
+      ++*pshndx;
+      if ((*p)->offset() != -1)
+       continue;
+      off = align_address(off, (*p)->addralign());
       (*p)->set_address(0, off);
       off += (*p)->data_size();
     }
   return off;
 }
 
-// Create the symbol table sections.
+// Create the symbol table sections.  Here we also set the final
+// values of the symbols.  At this point all the loadable sections are
+// fully laid out.
 
 void
-Layout::create_symtab_sections(const Input_objects* input_objects,
+Layout::create_symtab_sections(int size, const Input_objects* input_objects,
                               Symbol_table* symtab,
-                              Output_section** posymtab,
-                              Output_section** postrtab)
+                              off_t* poff)
 {
-  off_t off = 0;
-  for (Input_objects::Object_list::const_iterator p = input_objects->begin();
-       p != input_objects->end();
+  int symsize;
+  unsigned int align;
+  if (size == 32)
+    {
+      symsize = elfcpp::Elf_sizes<32>::sym_size;
+      align = 4;
+    }
+  else if (size == 64)
+    {
+      symsize = elfcpp::Elf_sizes<64>::sym_size;
+      align = 8;
+    }
+  else
+    gold_unreachable();
+
+  off_t off = *poff;
+  off = align_address(off, align);
+  off_t startoff = off;
+
+  // Save space for the dummy symbol at the start of the section.  We
+  // never bother to write this out--it will just be left as zero.
+  off += symsize;
+  unsigned int local_symbol_index = 1;
+
+  // Add STT_SECTION symbols for each Output section which needs one.
+  for (Section_list::iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    {
+      if (!(*p)->needs_symtab_index())
+       (*p)->set_symtab_index(-1U);
+      else
+       {
+         (*p)->set_symtab_index(local_symbol_index);
+         ++local_symbol_index;
+         off += symsize;
+       }
+    }
+
+  for (Input_objects::Relobj_iterator p = input_objects->relobj_begin();
+       p != input_objects->relobj_end();
        ++p)
     {
       Task_lock_obj<Object> tlo(**p);
-      off = (*p)->finalize_local_symbols(off, &this->sympool_);
+      unsigned int index = (*p)->finalize_local_symbols(local_symbol_index,
+                                                       off,
+                                                       &this->sympool_);
+      off += (index - local_symbol_index) * symsize;
+      local_symbol_index = index;
+    }
+
+  unsigned int local_symcount = local_symbol_index;
+  gold_assert(local_symcount * symsize == off - startoff);
+
+  off_t dynoff;
+  size_t dyn_global_index;
+  size_t dyncount;
+  if (this->dynsym_section_ == NULL)
+    {
+      dynoff = 0;
+      dyn_global_index = 0;
+      dyncount = 0;
     }
+  else
+    {
+      dyn_global_index = this->dynsym_section_->info();
+      off_t locsize = dyn_global_index * this->dynsym_section_->entsize();
+      dynoff = this->dynsym_section_->offset() + locsize;
+      dyncount = (this->dynsym_section_->data_size() - locsize) / symsize;
+      gold_assert(dyncount * symsize
+                 == this->dynsym_section_->data_size() - locsize);
+    }
+
+  off = symtab->finalize(local_symcount, off, dynoff, dyn_global_index,
+                        dyncount, &this->sympool_);
 
-  off = symtab->finalize(off, &this->sympool_);
+  this->sympool_.set_string_offsets();
 
-  *posymtab = new Output_section_symtab(this->namepool_.add(".symtab"), off);
-  *postrtab = new Output_section_strtab(this->namepool_.add(".strtab"),
-                                       &this->sympool_);
+  const char* symtab_name = this->namepool_.add(".symtab", NULL);
+  Output_section* osymtab = this->make_output_section(symtab_name,
+                                                     elfcpp::SHT_SYMTAB,
+                                                     0);
+  this->symtab_section_ = osymtab;
+
+  Output_section_data* pos = new Output_data_space(off - startoff,
+                                                  align);
+  osymtab->add_output_section_data(pos);
+
+  const char* strtab_name = this->namepool_.add(".strtab", NULL);
+  Output_section* ostrtab = this->make_output_section(strtab_name,
+                                                     elfcpp::SHT_STRTAB,
+                                                     0);
+
+  Output_section_data* pstr = new Output_data_strtab(&this->sympool_);
+  ostrtab->add_output_section_data(pstr);
+
+  osymtab->set_address(0, startoff);
+  osymtab->set_link_section(ostrtab);
+  osymtab->set_info(local_symcount);
+  osymtab->set_entsize(symsize);
+
+  *poff = off;
 }
 
 // Create the .shstrtab section, which holds the names of the
@@ -619,12 +818,14 @@ Layout::create_shstrtab()
   // FIXME: We don't need to create a .shstrtab section if we are
   // stripping everything.
 
-  const char* name = this->namepool_.add(".shstrtab");
+  const char* name = this->namepool_.add(".shstrtab", NULL);
 
-  Output_section* os = new Output_section_strtab(name,
-                                                &this->namepool_);
+  this->namepool_.set_string_offsets();
 
-  this->section_list_.push_back(os);
+  Output_section* os = this->make_output_section(name, elfcpp::SHT_STRTAB, 0);
+
+  Output_section_data* posd = new Output_data_strtab(&this->namepool_);
+  os->add_output_section_data(posd);
 
   return os;
 }
@@ -633,20 +834,386 @@ Layout::create_shstrtab()
 // offset.
 
 Output_section_headers*
-Layout::create_shdrs(int size, off_t off)
+Layout::create_shdrs(int size, bool big_endian, off_t* poff)
 {
   Output_section_headers* oshdrs;
-  oshdrs = new Output_section_headers(size, this->segment_list_,
-                                     this->section_list_);
-  uint64_t addralign = oshdrs->addralign();
-  off = (off + addralign - 1) & ~ (addralign - 1);
+  oshdrs = new Output_section_headers(size, big_endian, this,
+                                     &this->segment_list_,
+                                     &this->unattached_section_list_,
+                                     &this->namepool_);
+  off_t off = align_address(*poff, oshdrs->addralign());
   oshdrs->set_address(0, off);
+  off += oshdrs->data_size();
+  *poff = off;
+  this->special_output_list_.push_back(oshdrs);
   return oshdrs;
 }
 
+// Create the dynamic symbol table.
+
+void
+Layout::create_dynamic_symtab(const Target* target, Symbol_table* symtab,
+                             Output_section **pdynstr,
+                             unsigned int* plocal_dynamic_count,
+                             std::vector<Symbol*>* pdynamic_symbols,
+                             Versions* pversions)
+{
+  // Count all the symbols in the dynamic symbol table, and set the
+  // dynamic symbol indexes.
+
+  // Skip symbol 0, which is always all zeroes.
+  unsigned int index = 1;
+
+  // Add STT_SECTION symbols for each Output section which needs one.
+  for (Section_list::iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    {
+      if (!(*p)->needs_dynsym_index())
+       (*p)->set_dynsym_index(-1U);
+      else
+       {
+         (*p)->set_dynsym_index(index);
+         ++index;
+       }
+    }
+
+  // FIXME: Some targets apparently require local symbols in the
+  // dynamic symbol table.  Here is where we will have to count them,
+  // and set the dynamic symbol indexes, and add the names to
+  // this->dynpool_.
+
+  unsigned int local_symcount = index;
+  *plocal_dynamic_count = local_symcount;
+
+  // FIXME: We have to tell set_dynsym_indexes whether the
+  // -E/--export-dynamic option was used.
+  index = symtab->set_dynsym_indexes(&this->options_, target, index,
+                                    pdynamic_symbols, &this->dynpool_,
+                                    pversions);
+
+  int symsize;
+  unsigned int align;
+  const int size = target->get_size();
+  if (size == 32)
+    {
+      symsize = elfcpp::Elf_sizes<32>::sym_size;
+      align = 4;
+    }
+  else if (size == 64)
+    {
+      symsize = elfcpp::Elf_sizes<64>::sym_size;
+      align = 8;
+    }
+  else
+    gold_unreachable();
+
+  // Create the dynamic symbol table section.
+
+  const char* dynsym_name = this->namepool_.add(".dynsym", NULL);
+  Output_section* dynsym = this->make_output_section(dynsym_name,
+                                                    elfcpp::SHT_DYNSYM,
+                                                    elfcpp::SHF_ALLOC);
+
+  Output_section_data* odata = new Output_data_space(index * symsize,
+                                                    align);
+  dynsym->add_output_section_data(odata);
+
+  dynsym->set_info(local_symcount);
+  dynsym->set_entsize(symsize);
+  dynsym->set_addralign(align);
+
+  this->dynsym_section_ = dynsym;
+
+  Output_data_dynamic* const odyn = this->dynamic_data_;
+  odyn->add_section_address(elfcpp::DT_SYMTAB, dynsym);
+  odyn->add_constant(elfcpp::DT_SYMENT, symsize);
+
+  // Create the dynamic string table section.
+
+  const char* dynstr_name = this->namepool_.add(".dynstr", NULL);
+  Output_section* dynstr = this->make_output_section(dynstr_name,
+                                                    elfcpp::SHT_STRTAB,
+                                                    elfcpp::SHF_ALLOC);
+
+  Output_section_data* strdata = new Output_data_strtab(&this->dynpool_);
+  dynstr->add_output_section_data(strdata);
+
+  dynsym->set_link_section(dynstr);
+  this->dynamic_section_->set_link_section(dynstr);
+
+  odyn->add_section_address(elfcpp::DT_STRTAB, dynstr);
+  odyn->add_section_size(elfcpp::DT_STRSZ, dynstr);
+
+  *pdynstr = dynstr;
+
+  // Create the hash tables.
+
+  // FIXME: We need an option to create a GNU hash table.
+
+  unsigned char* phash;
+  unsigned int hashlen;
+  Dynobj::create_elf_hash_table(target, *pdynamic_symbols, local_symcount,
+                               &phash, &hashlen);
+
+  const char* hash_name = this->namepool_.add(".hash", NULL);
+  Output_section* hashsec = this->make_output_section(hash_name,
+                                                     elfcpp::SHT_HASH,
+                                                     elfcpp::SHF_ALLOC);
+
+  Output_section_data* hashdata = new Output_data_const_buffer(phash,
+                                                              hashlen,
+                                                              align);
+  hashsec->add_output_section_data(hashdata);
+
+  hashsec->set_link_section(dynsym);
+  hashsec->set_entsize(4);
+
+  odyn->add_section_address(elfcpp::DT_HASH, hashsec);
+}
+
+// Create the version sections.
+
+void
+Layout::create_version_sections(const Target* target, const Versions* versions,
+                               unsigned int local_symcount,
+                               const std::vector<Symbol*>& dynamic_symbols,
+                               const Output_section* dynstr)
+{
+  if (!versions->any_defs() && !versions->any_needs())
+    return;
+
+  if (target->get_size() == 32)
+    {
+      if (target->is_big_endian())
+        {
+#ifdef HAVE_TARGET_32_BIG
+          this->sized_create_version_sections
+              SELECT_SIZE_ENDIAN_NAME(32, true)(
+                  versions, local_symcount, dynamic_symbols, dynstr
+                  SELECT_SIZE_ENDIAN(32, true));
+#else
+          gold_unreachable();
+#endif
+        }
+      else
+        {
+#ifdef HAVE_TARGET_32_LITTLE
+          this->sized_create_version_sections
+              SELECT_SIZE_ENDIAN_NAME(32, false)(
+                  versions, local_symcount, dynamic_symbols, dynstr
+                  SELECT_SIZE_ENDIAN(32, false));
+#else
+          gold_unreachable();
+#endif
+        }
+    }
+  else if (target->get_size() == 64)
+    {
+      if (target->is_big_endian())
+        {
+#ifdef HAVE_TARGET_64_BIG
+          this->sized_create_version_sections
+              SELECT_SIZE_ENDIAN_NAME(64, true)(
+                  versions, local_symcount, dynamic_symbols, dynstr
+                  SELECT_SIZE_ENDIAN(64, true));
+#else
+          gold_unreachable();
+#endif
+        }
+      else
+        {
+#ifdef HAVE_TARGET_64_LITTLE
+          this->sized_create_version_sections
+              SELECT_SIZE_ENDIAN_NAME(64, false)(
+                  versions, local_symcount, dynamic_symbols, dynstr
+                  SELECT_SIZE_ENDIAN(64, false));
+#else
+          gold_unreachable();
+#endif
+        }
+    }
+  else
+    gold_unreachable();
+}
+
+// Create the version sections, sized version.
+
+template<int size, bool big_endian>
+void
+Layout::sized_create_version_sections(
+    const Versions* versions,
+    unsigned int local_symcount,
+    const std::vector<Symbol*>& dynamic_symbols,
+    const Output_section* dynstr
+    ACCEPT_SIZE_ENDIAN)
+{
+  const char* vname = this->namepool_.add(".gnu.version", NULL);
+  Output_section* vsec = this->make_output_section(vname,
+                                                  elfcpp::SHT_GNU_versym,
+                                                  elfcpp::SHF_ALLOC);
+
+  unsigned char* vbuf;
+  unsigned int vsize;
+  versions->symbol_section_contents SELECT_SIZE_ENDIAN_NAME(size, big_endian)(
+      &this->dynpool_, local_symcount, dynamic_symbols, &vbuf, &vsize
+      SELECT_SIZE_ENDIAN(size, big_endian));
+
+  Output_section_data* vdata = new Output_data_const_buffer(vbuf, vsize, 2);
+
+  vsec->add_output_section_data(vdata);
+  vsec->set_entsize(2);
+  vsec->set_link_section(this->dynsym_section_);
+
+  Output_data_dynamic* const odyn = this->dynamic_data_;
+  odyn->add_section_address(elfcpp::DT_VERSYM, vsec);
+
+  if (versions->any_defs())
+    {
+      const char* vdname = this->namepool_.add(".gnu.version_d", NULL);
+      Output_section *vdsec;
+      vdsec = this->make_output_section(vdname, elfcpp::SHT_GNU_verdef,
+                                       elfcpp::SHF_ALLOC);
+
+      unsigned char* vdbuf;
+      unsigned int vdsize;
+      unsigned int vdentries;
+      versions->def_section_contents SELECT_SIZE_ENDIAN_NAME(size, big_endian)(
+          &this->dynpool_, &vdbuf, &vdsize, &vdentries
+          SELECT_SIZE_ENDIAN(size, big_endian));
+
+      Output_section_data* vddata = new Output_data_const_buffer(vdbuf,
+                                                                vdsize,
+                                                                4);
+
+      vdsec->add_output_section_data(vddata);
+      vdsec->set_link_section(dynstr);
+      vdsec->set_info(vdentries);
+
+      odyn->add_section_address(elfcpp::DT_VERDEF, vdsec);
+      odyn->add_constant(elfcpp::DT_VERDEFNUM, vdentries);
+    }
+
+  if (versions->any_needs())
+    {
+      const char* vnname = this->namepool_.add(".gnu.version_r", NULL);
+      Output_section* vnsec;
+      vnsec = this->make_output_section(vnname, elfcpp::SHT_GNU_verneed,
+                                       elfcpp::SHF_ALLOC);
+
+      unsigned char* vnbuf;
+      unsigned int vnsize;
+      unsigned int vnentries;
+      versions->need_section_contents SELECT_SIZE_ENDIAN_NAME(size, big_endian)
+        (&this->dynpool_, &vnbuf, &vnsize, &vnentries
+         SELECT_SIZE_ENDIAN(size, big_endian));
+
+      Output_section_data* vndata = new Output_data_const_buffer(vnbuf,
+                                                                vnsize,
+                                                                4);
+
+      vnsec->add_output_section_data(vndata);
+      vnsec->set_link_section(dynstr);
+      vnsec->set_info(vnentries);
+
+      odyn->add_section_address(elfcpp::DT_VERNEED, vnsec);
+      odyn->add_constant(elfcpp::DT_VERNEEDNUM, vnentries);
+    }
+}
+
+// Create the .interp section and PT_INTERP segment.
+
+void
+Layout::create_interp(const Target* target)
+{
+  const char* interp = this->options_.dynamic_linker();
+  if (interp == NULL)
+    {
+      interp = target->dynamic_linker();
+      gold_assert(interp != NULL);
+    }
+
+  size_t len = strlen(interp) + 1;
+
+  Output_section_data* odata = new Output_data_const(interp, len, 1);
+
+  const char* interp_name = this->namepool_.add(".interp", NULL);
+  Output_section* osec = this->make_output_section(interp_name,
+                                                  elfcpp::SHT_PROGBITS,
+                                                  elfcpp::SHF_ALLOC);
+  osec->add_output_section_data(odata);
+
+  Output_segment* oseg = new Output_segment(elfcpp::PT_INTERP, elfcpp::PF_R);
+  this->segment_list_.push_back(oseg);
+  oseg->add_initial_output_section(osec, elfcpp::PF_R);
+}
+
+// Finish the .dynamic section and PT_DYNAMIC segment.
+
+void
+Layout::finish_dynamic_section(const Input_objects* input_objects,
+                              const Symbol_table* symtab)
+{
+  Output_segment* oseg = new Output_segment(elfcpp::PT_DYNAMIC,
+                                           elfcpp::PF_R | elfcpp::PF_W);
+  this->segment_list_.push_back(oseg);
+  oseg->add_initial_output_section(this->dynamic_section_,
+                                  elfcpp::PF_R | elfcpp::PF_W);
+
+  Output_data_dynamic* const odyn = this->dynamic_data_;
+
+  for (Input_objects::Dynobj_iterator p = input_objects->dynobj_begin();
+       p != input_objects->dynobj_end();
+       ++p)
+    {
+      // FIXME: Handle --as-needed.
+      odyn->add_string(elfcpp::DT_NEEDED, (*p)->soname());
+    }
+
+  // FIXME: Support --init and --fini.
+  Symbol* sym = symtab->lookup("_init");
+  if (sym != NULL && sym->is_defined() && !sym->is_from_dynobj())
+    odyn->add_symbol(elfcpp::DT_INIT, sym);
+
+  sym = symtab->lookup("_fini");
+  if (sym != NULL && sym->is_defined() && !sym->is_from_dynobj())
+    odyn->add_symbol(elfcpp::DT_FINI, sym);
+
+  // FIXME: Support DT_INIT_ARRAY and DT_FINI_ARRAY.
+
+  // Add a DT_RPATH entry if needed.
+  const General_options::Dir_list& rpath(this->options_.rpath());
+  if (!rpath.empty())
+    {
+      std::string rpath_val;
+      for (General_options::Dir_list::const_iterator p = rpath.begin();
+           p != rpath.end();
+           ++p)
+        {
+          if (rpath_val.empty())
+            rpath_val = *p;
+          else
+            {
+              // Eliminate duplicates.
+              General_options::Dir_list::const_iterator q;
+              for (q = rpath.begin(); q != p; ++q)
+                if (strcmp(*q, *p) == 0)
+                  break;
+              if (q == p)
+                {
+                  rpath_val += ':';
+                  rpath_val += *p;
+                }
+            }
+        }
+
+      odyn->add_string(elfcpp::DT_RPATH, rpath_val);
+    }
+}
+
 // The mapping of .gnu.linkonce section names to real section names.
 
-#define MAPPING_INIT(f, t) { f, sizeof(f) - 1, t }
+#define MAPPING_INIT(f, t) { f, sizeof(f) - 1, t, sizeof(t) - 1 }
 const Layout::Linkonce_mapping Layout::linkonce_mapping[] =
 {
   MAPPING_INIT("d.rel.ro", ".data.rel.ro"),    // Must be before "d".
@@ -673,10 +1240,11 @@ const int Layout::linkonce_mapping_count =
 // Return the name of the output section to use for a .gnu.linkonce
 // section.  This is based on the default ELF linker script of the old
 // GNU linker.  For example, we map a name like ".gnu.linkonce.t.foo"
-// to ".text".
+// to ".text".  Set *PLEN to the length of the name.  *PLEN is
+// initialized to the length of NAME.
 
 const char*
-Layout::linkonce_output_name(const char* name)
+Layout::linkonce_output_name(const char* name, size_t *plen)
 {
   const char* s = name + sizeof(".gnu.linkonce") - 1;
   if (*s != '.')
@@ -686,11 +1254,67 @@ Layout::linkonce_output_name(const char* name)
   for (int i = 0; i < linkonce_mapping_count; ++i, ++plm)
     {
       if (strncmp(s, plm->from, plm->fromlen) == 0 && s[plm->fromlen] == '.')
-       return plm->to;
+       {
+         *plen = plm->tolen;
+         return plm->to;
+       }
     }
   return name;
 }
 
+// Choose the output section name to use given an input section name.
+// Set *PLEN to the length of the name.  *PLEN is initialized to the
+// length of NAME.
+
+const char*
+Layout::output_section_name(const char* name, size_t* plen)
+{
+  if (Layout::is_linkonce(name))
+    {
+      // .gnu.linkonce sections are laid out as though they were named
+      // for the sections are placed into.
+      return Layout::linkonce_output_name(name, plen);
+    }
+
+  // If the section name has no '.', or only an initial '.', we use
+  // the name unchanged (i.e., ".text" is unchanged).
+
+  // Otherwise, if the section name does not include ".rel", we drop
+  // the last '.'  and everything that follows (i.e., ".text.XXX"
+  // becomes ".text").
+
+  // Otherwise, if the section name has zero or one '.' after the
+  // ".rel", we use the name unchanged (i.e., ".rel.text" is
+  // unchanged).
+
+  // Otherwise, we drop the last '.' and everything that follows
+  // (i.e., ".rel.text.XXX" becomes ".rel.text").
+
+  const char* s = name;
+  if (*s == '.')
+    ++s;
+  const char* sdot = strchr(s, '.');
+  if (sdot == NULL)
+    return name;
+
+  const char* srel = strstr(s, ".rel");
+  if (srel == NULL)
+    {
+      *plen = sdot - name;
+      return name;
+    }
+
+  sdot = strchr(srel + 1, '.');
+  if (sdot == NULL)
+    return name;
+  sdot = strchr(sdot + 1, '.');
+  if (sdot == NULL)
+    return name;
+
+  *plen = sdot - name;
+  return name;
+}
+
 // Record the signature of a comdat section, and return whether to
 // include it in the link.  If GROUP is true, this is a regular
 // section group.  If GROUP is false, this is a group signature
@@ -703,7 +1327,7 @@ Layout::add_comdat(const char* signature, bool group)
 {
   std::string sig(signature);
   std::pair<Signatures::iterator, bool> ins(
-    this->signatures_.insert(std::make_pair(signature, group)));
+    this->signatures_.insert(std::make_pair(sig, group)));
 
   if (ins.second)
     {
@@ -733,28 +1357,153 @@ Layout::add_comdat(const char* signature, bool group)
     }
 }
 
+// Write out data not associated with a section or the symbol table.
+
+void
+Layout::write_data(const Symbol_table* symtab, const Target* target,
+                  Output_file* of) const
+{
+  const Output_section* symtab_section = this->symtab_section_;
+  for (Section_list::const_iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    {
+      if ((*p)->needs_symtab_index())
+       {
+         gold_assert(symtab_section != NULL);
+         unsigned int index = (*p)->symtab_index();
+         gold_assert(index > 0 && index != -1U);
+         off_t off = (symtab_section->offset()
+                      + index * symtab_section->entsize());
+         symtab->write_section_symbol(target, *p, of, off);
+       }
+    }
+
+  const Output_section* dynsym_section = this->dynsym_section_;
+  for (Section_list::const_iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    {
+      if ((*p)->needs_dynsym_index())
+       {
+         gold_assert(dynsym_section != NULL);
+         unsigned int index = (*p)->dynsym_index();
+         gold_assert(index > 0 && index != -1U);
+         off_t off = (dynsym_section->offset()
+                      + index * dynsym_section->entsize());
+         symtab->write_section_symbol(target, *p, of, off);
+       }
+    }
+
+  // Write out the Output_sections.  Most won't have anything to
+  // write, since most of the data will come from input sections which
+  // are handled elsewhere.  But some Output_sections do have
+  // Output_data.
+  for (Section_list::const_iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    (*p)->write(of);
+
+  // Write out the Output_data which are not in an Output_section.
+  for (Data_list::const_iterator p = this->special_output_list_.begin();
+       p != this->special_output_list_.end();
+       ++p)
+    (*p)->write(of);
+}
+
+// Write_data_task methods.
+
+// We can always run this task.
+
+Task::Is_runnable_type
+Write_data_task::is_runnable(Workqueue*)
+{
+  return IS_RUNNABLE;
+}
+
+// We need to unlock FINAL_BLOCKER when finished.
+
+Task_locker*
+Write_data_task::locks(Workqueue* workqueue)
+{
+  return new Task_locker_block(*this->final_blocker_, workqueue);
+}
+
+// Run the task--write out the data.
+
+void
+Write_data_task::run(Workqueue*)
+{
+  this->layout_->write_data(this->symtab_, this->target_, this->of_);
+}
+
+// Write_symbols_task methods.
+
+// We can always run this task.
+
+Task::Is_runnable_type
+Write_symbols_task::is_runnable(Workqueue*)
+{
+  return IS_RUNNABLE;
+}
+
+// We need to unlock FINAL_BLOCKER when finished.
+
+Task_locker*
+Write_symbols_task::locks(Workqueue* workqueue)
+{
+  return new Task_locker_block(*this->final_blocker_, workqueue);
+}
+
+// Run the task--write out the symbols.
+
+void
+Write_symbols_task::run(Workqueue*)
+{
+  this->symtab_->write_globals(this->target_, this->sympool_, this->dynpool_,
+                              this->of_);
+}
+
+// Close_task_runner methods.
+
+// Run the task--close the file.
+
+void
+Close_task_runner::run(Workqueue*)
+{
+  this->of_->close();
+}
+
 // Instantiate the templates we need.  We could use the configure
 // script to restrict this to only the ones for implemented targets.
 
+#ifdef HAVE_TARGET_32_LITTLE
 template
 Output_section*
-Layout::layout<32, false>(Object* object, const char* name,
+Layout::layout<32, false>(Relobj* object, unsigned int shndx, const char* name,
                          const elfcpp::Shdr<32, false>& shdr, off_t*);
+#endif
 
+#ifdef HAVE_TARGET_32_BIG
 template
 Output_section*
-Layout::layout<32, true>(Object* object, const char* name,
+Layout::layout<32, true>(Relobj* object, unsigned int shndx, const char* name,
                         const elfcpp::Shdr<32, true>& shdr, off_t*);
+#endif
 
+#ifdef HAVE_TARGET_64_LITTLE
 template
 Output_section*
-Layout::layout<64, false>(Object* object, const char* name,
+Layout::layout<64, false>(Relobj* object, unsigned int shndx, const char* name,
                          const elfcpp::Shdr<64, false>& shdr, off_t*);
+#endif
 
+#ifdef HAVE_TARGET_64_BIG
 template
 Output_section*
-Layout::layout<64, true>(Object* object, const char* name,
+Layout::layout<64, true>(Relobj* object, unsigned int shndx, const char* name,
                         const elfcpp::Shdr<64, true>& shdr, off_t*);
+#endif
 
 
 } // End namespace gold.
This page took 0.037588 seconds and 4 git commands to generate.