From Craig Silverstein: rename some option functions in preparation
[external/binutils.git] / gold / layout.cc
index 1139cf1..fd7f3af 100644 (file)
@@ -1,6 +1,6 @@
 // layout.cc -- lay out output file sections for gold
 
-// Copyright 2006, 2007 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
 #include <utility>
 
 #include "parameters.h"
+#include "options.h"
+#include "script.h"
+#include "script-sections.h"
 #include "output.h"
 #include "symtab.h"
 #include "dynobj.h"
 #include "ehframe.h"
 #include "compressed_output.h"
+#include "reloc.h"
 #include "layout.h"
 
 namespace gold
@@ -44,15 +48,18 @@ namespace gold
 // have been read.
 
 void
-Layout_task_runner::run(Workqueue* workqueue)
+Layout_task_runner::run(Workqueue* workqueue, const Task* task)
 {
   off_t file_size = this->layout_->finalize(this->input_objects_,
-                                           this->symtab_);
+                                           this->symtab_,
+                                            this->target_,
+                                           task);
 
   // 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_,
-                                    this->input_objects_->target());
+  Output_file* of = new Output_file(parameters->options().output_file_name());
+  if (this->options_.oformat_enum() != General_options::OBJECT_FORMAT_ELF)
+    of->set_is_temporary();
   of->open(file_size);
 
   // Queue up the final set of tasks.
@@ -62,16 +69,19 @@ Layout_task_runner::run(Workqueue* workqueue)
 
 // Layout methods.
 
-Layout::Layout(const General_options& options)
-  : options_(options), namepool_(), sympool_(), dynpool_(), signatures_(),
+Layout::Layout(const General_options& options, Script_options* script_options)
+  : options_(options), script_options_(script_options), namepool_(),
+    sympool_(), dynpool_(), signatures_(),
     section_name_map_(), segment_list_(), section_list_(),
     unattached_section_list_(), special_output_list_(),
     section_headers_(NULL), tls_segment_(NULL), symtab_section_(NULL),
     dynsym_section_(NULL), dynamic_section_(NULL), dynamic_data_(NULL),
-    eh_frame_section_(NULL), output_file_size_(-1),
+    eh_frame_section_(NULL), group_signatures_(), output_file_size_(-1),
     input_requires_executable_stack_(false),
     input_with_gnu_stack_note_(false),
-    input_without_gnu_stack_note_(false)
+    input_without_gnu_stack_note_(false),
+    has_static_tls_(false),
+    any_postprocessing_sections_(false)
 {
   // 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.
@@ -132,8 +142,6 @@ bool
 Layout::include_section(Sized_relobj<size, big_endian>*, const char* name,
                        const elfcpp::Shdr<size, big_endian>& shdr)
 {
-  // Some section types are never linked.  Some are only linked when
-  // doing a relocateable link.
   switch (shdr.get_sh_type())
     {
     case elfcpp::SHT_NULL:
@@ -148,10 +156,14 @@ Layout::include_section(Sized_relobj<size, big_endian>*, const char* name,
     case elfcpp::SHT_RELA:
     case elfcpp::SHT_REL:
     case elfcpp::SHT_GROUP:
-      return parameters->output_is_object();
+      // If we are emitting relocations these should be handled
+      // elsewhere.
+      gold_assert(!parameters->options().relocatable()
+                 && !parameters->options().emit_relocs());
+      return false;
 
     case elfcpp::SHT_PROGBITS:
-      if (parameters->strip_debug()
+      if (parameters->options().strip_debug()
          && (shdr.get_sh_flags() & elfcpp::SHF_ALLOC) == 0)
        {
          // Debugging sections can only be recognized by name.
@@ -161,7 +173,7 @@ Layout::include_section(Sized_relobj<size, big_endian>*, const char* name,
              || is_prefix_of(".stab", name))
            return false;
        }
-      if (parameters->strip_debug_gdb()
+      if (parameters->options().strip_debug_gdb()
          && (shdr.get_sh_flags() & elfcpp::SHF_ALLOC) == 0)
        {
          // Debugging sections can only be recognized by name.
@@ -181,11 +193,11 @@ Layout::include_section(Sized_relobj<size, big_endian>*, const char* name,
 Output_section*
 Layout::find_output_section(const char* name) const
 {
-  for (Section_name_map::const_iterator p = this->section_name_map_.begin();
-       p != this->section_name_map_.end();
+  for (Section_list::const_iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
        ++p)
-    if (strcmp(p->second->name(), name) == 0)
-      return p->second;
+    if (strcmp((*p)->name(), name) == 0)
+      return *p;
   return NULL;
 }
 
@@ -207,19 +219,13 @@ Layout::find_output_segment(elfcpp::PT type, elfcpp::Elf_Word set,
 }
 
 // Return the output section to use for section NAME with type TYPE
-// and section flags FLAGS.
+// and section flags FLAGS.  NAME must be canonicalized in the string
+// pool, and NAME_KEY is the key.
 
 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(
@@ -230,13 +236,100 @@ Layout::get_output_section(const char* name, Stringpool::Key name_key,
   else
     {
       // This is the first time we've seen this name/type/flags
-      // combination.
-      Output_section* os = this->make_output_section(name, type, flags);
+      // combination.  If the section has contents but no flags, then
+      // see whether we have an existing section with the same name.
+      // This is a workaround for cases where assembler code forgets
+      // to set section flags, and the GNU linker would simply pick an
+      // existing section with the same name.  FIXME: Perhaps there
+      // should be an option to control this.
+      Output_section* os = NULL;
+      if (type == elfcpp::SHT_PROGBITS && flags == 0)
+       {
+         os = this->find_output_section(name);
+         if (os != NULL && os->type() != elfcpp::SHT_PROGBITS)
+           os = NULL;
+       }
+      if (os == NULL)
+       os = this->make_output_section(name, type, flags);
       ins.first->second = os;
       return os;
     }
 }
 
+// Pick the output section to use for section NAME, in input file
+// RELOBJ, with type TYPE and flags FLAGS.  RELOBJ may be NULL for a
+// linker created section.  ADJUST_NAME is true if we should apply the
+// standard name mappings in Layout::output_section_name.  This will
+// return NULL if the input section should be discarded.
+
+Output_section*
+Layout::choose_output_section(const Relobj* relobj, const char* name,
+                             elfcpp::Elf_Word type, elfcpp::Elf_Xword flags,
+                             bool adjust_name)
+{
+  // We should ignore some flags.  FIXME: This will need some
+  // adjustment for ld -r.
+  flags &= ~ (elfcpp::SHF_INFO_LINK
+             | elfcpp::SHF_LINK_ORDER
+             | elfcpp::SHF_GROUP
+             | elfcpp::SHF_MERGE
+             | elfcpp::SHF_STRINGS);
+
+  if (this->script_options_->saw_sections_clause())
+    {
+      // We are using a SECTIONS clause, so the output section is
+      // chosen based only on the name.
+
+      Script_sections* ss = this->script_options_->script_sections();
+      const char* file_name = relobj == NULL ? NULL : relobj->name().c_str();
+      Output_section** output_section_slot;
+      name = ss->output_section_name(file_name, name, &output_section_slot);
+      if (name == NULL)
+       {
+         // The SECTIONS clause says to discard this input section.
+         return NULL;
+       }
+
+      // If this is an orphan section--one not mentioned in the linker
+      // script--then OUTPUT_SECTION_SLOT will be NULL, and we do the
+      // default processing below.
+
+      if (output_section_slot != NULL)
+       {
+         if (*output_section_slot != NULL)
+           return *output_section_slot;
+
+         // We don't put sections found in the linker script into
+         // SECTION_NAME_MAP_.  That keeps us from getting confused
+         // if an orphan section is mapped to a section with the same
+         // name as one in the linker script.
+
+         name = this->namepool_.add(name, false, NULL);
+
+         Output_section* os = this->make_output_section(name, type, flags);
+         os->set_found_in_sections_clause();
+         *output_section_slot = os;
+         return os;
+       }
+    }
+
+  // FIXME: Handle SHF_OS_NONCONFORMING somewhere.
+
+  // Turn NAME from the name of the input section into the name of the
+  // output section.
+
+  size_t len = strlen(name);
+  if (adjust_name && !parameters->options().relocatable())
+    name = Layout::output_section_name(name, &len);
+
+  Stringpool::Key name_key;
+  name = this->namepool_.add_with_length(name, len, true, &name_key);
+
+  // Find or make the output section.  The output section is selected
+  // based on the section name, type, and flags.
+  return this->get_output_section(name, name_key, type, flags);
+}
+
 // Return the output section to use for input section SHNDX, with name
 // NAME, with header HEADER, from object OBJECT.  RELOC_SHNDX is the
 // index of a relocation section which applies to this section, or 0
@@ -256,31 +349,131 @@ Layout::layout(Sized_relobj<size, big_endian>* object, unsigned int shndx,
   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 (!parameters->output_is_object())
-    name = Layout::output_section_name(name, &len);
+  Output_section* os;
 
-  // FIXME: Handle SHF_OS_NONCONFORMING here.
+  // In a relocatable link a grouped section must not be combined with
+  // any other sections.
+  if (parameters->options().relocatable()
+      && (shdr.get_sh_flags() & elfcpp::SHF_GROUP) != 0)
+    {
+      name = this->namepool_.add(name, true, NULL);
+      os = this->make_output_section(name, shdr.get_sh_type(),
+                                    shdr.get_sh_flags());
+    }
+  else
+    {
+      os = this->choose_output_section(object, name, shdr.get_sh_type(),
+                                      shdr.get_sh_flags(), true);
+      if (os == NULL)
+       return NULL;
+    }
 
-  // Canonicalize the section name.
-  Stringpool::Key name_key;
-  name = this->namepool_.add_prefix(name, len, &name_key);
+  // FIXME: Handle SHF_LINK_ORDER somewhere.
 
-  // 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());
+  *off = os->add_input_section(object, shndx, name, shdr, reloc_shndx,
+                              this->script_options_->saw_sections_clause());
 
-  // FIXME: Handle SHF_LINK_ORDER somewhere.
+  return os;
+}
+
+// Handle a relocation section when doing a relocatable link.
+
+template<int size, bool big_endian>
+Output_section*
+Layout::layout_reloc(Sized_relobj<size, big_endian>* object,
+                    unsigned int,
+                    const elfcpp::Shdr<size, big_endian>& shdr,
+                    Output_section* data_section,
+                    Relocatable_relocs* rr)
+{
+  gold_assert(parameters->options().relocatable()
+             || parameters->options().emit_relocs());
+
+  int sh_type = shdr.get_sh_type();
+
+  std::string name;
+  if (sh_type == elfcpp::SHT_REL)
+    name = ".rel";
+  else if (sh_type == elfcpp::SHT_RELA)
+    name = ".rela";
+  else
+    gold_unreachable();
+  name += data_section->name();
+
+  Output_section* os = this->choose_output_section(object, name.c_str(),
+                                                  sh_type,
+                                                  shdr.get_sh_flags(),
+                                                  false);
 
-  *off = os->add_input_section(object, shndx, name, shdr, reloc_shndx);
+  os->set_should_link_to_symtab();
+  os->set_info_section(data_section);
+
+  Output_section_data* posd;
+  if (sh_type == elfcpp::SHT_REL)
+    {
+      os->set_entsize(elfcpp::Elf_sizes<size>::rel_size);
+      posd = new Output_relocatable_relocs<elfcpp::SHT_REL,
+                                          size,
+                                          big_endian>(rr);
+    }
+  else if (sh_type == elfcpp::SHT_RELA)
+    {
+      os->set_entsize(elfcpp::Elf_sizes<size>::rela_size);
+      posd = new Output_relocatable_relocs<elfcpp::SHT_RELA,
+                                          size,
+                                          big_endian>(rr);
+    }
+  else
+    gold_unreachable();
+
+  os->add_output_section_data(posd);
+  rr->set_output_data(posd);
 
   return os;
 }
 
+// Handle a group section when doing a relocatable link.
+
+template<int size, bool big_endian>
+void
+Layout::layout_group(Symbol_table* symtab,
+                    Sized_relobj<size, big_endian>* object,
+                    unsigned int,
+                    const char* group_section_name,
+                    const char* signature,
+                    const elfcpp::Shdr<size, big_endian>& shdr,
+                    const elfcpp::Elf_Word* contents)
+{
+  gold_assert(parameters->options().relocatable());
+  gold_assert(shdr.get_sh_type() == elfcpp::SHT_GROUP);
+  group_section_name = this->namepool_.add(group_section_name, true, NULL);
+  Output_section* os = this->make_output_section(group_section_name,
+                                                elfcpp::SHT_GROUP,
+                                                shdr.get_sh_flags());
+
+  // We need to find a symbol with the signature in the symbol table.
+  // If we don't find one now, we need to look again later.
+  Symbol* sym = symtab->lookup(signature, NULL);
+  if (sym != NULL)
+    os->set_info_symndx(sym);
+  else
+    {
+      // We will wind up using a symbol whose name is the signature.
+      // So just put the signature in the symbol name pool to save it.
+      signature = symtab->canonicalize_name(signature);
+      this->group_signatures_.push_back(Group_signature(os, signature));
+    }
+
+  os->set_should_link_to_symtab();
+  os->set_entsize(4);
+
+  section_size_type entry_count =
+    convert_to_section_size_type(shdr.get_sh_size() / 4);
+  Output_section_data* posd =
+    new Output_data_group<size, big_endian>(object, entry_count, contents);
+  os->add_output_section_data(posd);
+}
+
 // Special GNU handling of sections name .eh_frame.  They will
 // normally hold exception frame data as defined by the C++ ABI
 // (http://codesourcery.com/cxx-abi/).
@@ -300,12 +493,14 @@ Layout::layout_eh_frame(Sized_relobj<size, big_endian>* object,
   gold_assert(shdr.get_sh_type() == elfcpp::SHT_PROGBITS);
   gold_assert(shdr.get_sh_flags() == elfcpp::SHF_ALLOC);
 
-  Stringpool::Key name_key;
-  const char* name = this->namepool_.add(".eh_frame", false, &name_key);
-
-  Output_section* os = this->get_output_section(name, name_key,
-                                               elfcpp::SHT_PROGBITS,
-                                               elfcpp::SHF_ALLOC);
+  const char* const name = ".eh_frame";
+  Output_section* os = this->choose_output_section(object,
+                                                  name,
+                                                  elfcpp::SHT_PROGBITS,
+                                                  elfcpp::SHF_ALLOC,
+                                                  false);
+  if (os == NULL)
+    return NULL;
 
   if (this->eh_frame_section_ == NULL)
     {
@@ -313,28 +508,33 @@ Layout::layout_eh_frame(Sized_relobj<size, big_endian>* object,
       this->eh_frame_data_ = new Eh_frame();
       os->add_output_section_data(this->eh_frame_data_);
 
-      if (this->options_.create_eh_frame_hdr())
+      if (this->options_.eh_frame_hdr())
        {
-         Stringpool::Key hdr_name_key;
-         const char* hdr_name = this->namepool_.add(".eh_frame_hdr",
-                                                     false,
-                                                    &hdr_name_key);
          Output_section* hdr_os =
-           this->get_output_section(hdr_name, hdr_name_key,
-                                    elfcpp::SHT_PROGBITS,
-                                    elfcpp::SHF_ALLOC);
+           this->choose_output_section(NULL,
+                                       ".eh_frame_hdr",
+                                       elfcpp::SHT_PROGBITS,
+                                       elfcpp::SHF_ALLOC,
+                                       false);
 
-         Eh_frame_hdr* hdr_posd = new Eh_frame_hdr(os, this->eh_frame_data_);
-         hdr_os->add_output_section_data(hdr_posd);
+         if (hdr_os != NULL)
+           {
+             Eh_frame_hdr* hdr_posd = new Eh_frame_hdr(os,
+                                                       this->eh_frame_data_);
+             hdr_os->add_output_section_data(hdr_posd);
 
-         hdr_os->set_after_input_sections();
+             hdr_os->set_after_input_sections();
 
-         Output_segment* hdr_oseg =
-           new Output_segment(elfcpp::PT_GNU_EH_FRAME, elfcpp::PF_R);
-         this->segment_list_.push_back(hdr_oseg);
-         hdr_oseg->add_output_section(hdr_os, elfcpp::PF_R);
+             if (!this->script_options_->saw_phdrs_clause())
+               {
+                 Output_segment* hdr_oseg;
+                 hdr_oseg = this->make_output_segment(elfcpp::PT_GNU_EH_FRAME,
+                                                      elfcpp::PF_R);
+                 hdr_oseg->add_output_section(hdr_os, elfcpp::PF_R);
+               }
 
-         this->eh_frame_data_->set_eh_frame_hdr(hdr_posd);
+             this->eh_frame_data_->set_eh_frame_hdr(hdr_posd);
+           }
        }
     }
 
@@ -353,7 +553,9 @@ Layout::layout_eh_frame(Sized_relobj<size, big_endian>* object,
     {
       // We couldn't handle this .eh_frame section for some reason.
       // Add it as a normal section.
-      *off = os->add_input_section(object, shndx, name, shdr, reloc_shndx);
+      bool saw_sections_clause = this->script_options_->saw_sections_clause();
+      *off = os->add_input_section(object, shndx, name, shdr, reloc_shndx,
+                                  saw_sections_clause);
     }
 
   return os;
@@ -366,12 +568,10 @@ 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, true, &name_key);
-
-  Output_section* os = this->get_output_section(name, name_key, type, flags);
-  os->add_output_section_data(posd);
+  Output_section* os = this->choose_output_section(NULL, name, type, flags,
+                                                  false);
+  if (os != NULL)
+    os->add_output_section_data(posd);
 }
 
 // Map section flags to segment flags.
@@ -424,15 +624,24 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
     this->unattached_section_list_.push_back(os);
   else
     {
+      if (parameters->options().relocatable())
+       return os;
+
+      // If we have a SECTIONS clause, we can't handle the attachment
+      // to segments until after we've seen all the sections.
+      if (this->script_options_->saw_sections_clause())
+       return os;
+
+      gold_assert(!this->script_options_->saw_phdrs_clause());
+
       // This output section goes into a PT_LOAD segment.
 
       elfcpp::Elf_Word seg_flags = Layout::section_flags_to_segment(flags);
 
-      // The only thing we really care about for PT_LOAD segments is
-      // whether or not they are writable, so that is how we search
-      // for them.  People who need segments sorted on some other
-      // basis will have to wait until we implement a mechanism for
-      // them to describe the segments they want.
+      // In general the only thing we really care about for PT_LOAD
+      // segments is whether or not they are writable, so that is how
+      // we search for them.  People who need segments sorted on some
+      // other basis will have to use a linker script.
 
       Segment_list::const_iterator p;
       for (p = this->segment_list_.begin();
@@ -442,6 +651,15 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
          if ((*p)->type() == elfcpp::PT_LOAD
              && ((*p)->flags() & elfcpp::PF_W) == (seg_flags & elfcpp::PF_W))
            {
+             // If -Tbss was specified, we need to separate the data
+             // and BSS segments.
+             if (this->options_.user_set_Tbss())
+               {
+                 if ((type == elfcpp::SHT_NOBITS)
+                     == (*p)->has_any_data_sections())
+                   continue;
+               }
+
              (*p)->add_output_section(os, seg_flags);
              break;
            }
@@ -449,9 +667,8 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
 
       if (p == this->segment_list_.end())
        {
-         Output_segment* oseg = new Output_segment(elfcpp::PT_LOAD,
-                                                   seg_flags);
-         this->segment_list_.push_back(oseg);
+         Output_segment* oseg = this->make_output_segment(elfcpp::PT_LOAD,
+                                                          seg_flags);
          oseg->add_output_section(os, seg_flags);
        }
 
@@ -475,9 +692,8 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
 
          if (p == this->segment_list_.end())
            {
-             Output_segment* oseg = new Output_segment(elfcpp::PT_NOTE,
-                                                       seg_flags);
-             this->segment_list_.push_back(oseg);
+             Output_segment* oseg = this->make_output_segment(elfcpp::PT_NOTE,
+                                                              seg_flags);
              oseg->add_output_section(os, seg_flags);
            }
        }
@@ -487,11 +703,8 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
       if ((flags & elfcpp::SHF_TLS) != 0)
        {
          if (this->tls_segment_ == NULL)
-           {
-             this->tls_segment_ = new Output_segment(elfcpp::PT_TLS,
-                                                     seg_flags);
-             this->segment_list_.push_back(this->tls_segment_);
-           }
+           this->tls_segment_ = this->make_output_segment(elfcpp::PT_TLS,
+                                                          seg_flags);
          this->tls_segment_->add_output_section(os, seg_flags);
        }
     }
@@ -499,6 +712,39 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
   return os;
 }
 
+// Make an output section for a script.
+
+Output_section*
+Layout::make_output_section_for_script(const char* name)
+{
+  name = this->namepool_.add(name, false, NULL);
+  Output_section* os = this->make_output_section(name, elfcpp::SHT_PROGBITS,
+                                                elfcpp::SHF_ALLOC);
+  os->set_found_in_sections_clause();
+  return os;
+}
+
+// Return the number of segments we expect to see.
+
+size_t
+Layout::expected_segment_count() const
+{
+  size_t ret = this->segment_list_.size();
+
+  // If we didn't see a SECTIONS clause in a linker script, we should
+  // already have the complete list of segments.  Otherwise we ask the
+  // SECTIONS clause how many segments it expects, and add in the ones
+  // we already have (PT_GNU_STACK, PT_GNU_EH_FRAME, etc.)
+
+  if (!this->script_options_->saw_sections_clause())
+    return ret;
+  else
+    {
+      const Script_sections* ss = this->script_options_->script_sections();
+      return ret + ss->expected_segment_count(this);
+    }
+}
+
 // Handle the .note.GNU-stack section at layout time.  SEEN_GNU_STACK
 // is whether we saw a .note.GNU-stack section in the object file.
 // GNU_STACK_FLAGS is the section flags.  The flags give the
@@ -524,20 +770,18 @@ Layout::layout_gnu_stack(bool seen_gnu_stack, uint64_t gnu_stack_flags)
 // relocs.
 
 void
-Layout::create_initial_dynamic_sections(const Input_objects* input_objects,
-                                       Symbol_table* symtab)
+Layout::create_initial_dynamic_sections(Symbol_table* symtab)
 {
   if (parameters->doing_static_link())
     return;
 
-  const char* dynamic_name = this->namepool_.add(".dynamic", false, NULL);
-  this->dynamic_section_ = this->make_output_section(dynamic_name,
-                                                    elfcpp::SHT_DYNAMIC,
-                                                    (elfcpp::SHF_ALLOC
-                                                     | elfcpp::SHF_WRITE));
+  this->dynamic_section_ = this->choose_output_section(NULL, ".dynamic",
+                                                      elfcpp::SHT_DYNAMIC,
+                                                      (elfcpp::SHF_ALLOC
+                                                       | elfcpp::SHF_WRITE),
+                                                      false);
 
-  symtab->define_in_output_data(input_objects->target(), "_DYNAMIC", NULL,
-                               this->dynamic_section_, 0, 0,
+  symtab->define_in_output_data("_DYNAMIC", NULL, this->dynamic_section_, 0, 0,
                                elfcpp::STT_OBJECT, elfcpp::STB_LOCAL,
                                elfcpp::STV_HIDDEN, 0, false, false);
 
@@ -551,7 +795,7 @@ Layout::create_initial_dynamic_sections(const Input_objects* input_objects,
 // extension.
 
 void
-Layout::define_section_symbols(Symbol_table* symtab, const Target* target)
+Layout::define_section_symbols(Symbol_table* symtab)
 {
   for (Section_list::const_iterator p = this->section_list_.begin();
        p != this->section_list_.end();
@@ -569,8 +813,7 @@ Layout::define_section_symbols(Symbol_table* symtab, const Target* target)
          const std::string start_name("__start_" + name_string);
          const std::string stop_name("__stop_" + name_string);
 
-         symtab->define_in_output_data(target,
-                                       start_name.c_str(),
+         symtab->define_in_output_data(start_name.c_str(),
                                        NULL, // version
                                        *p,
                                        0, // value
@@ -580,10 +823,9 @@ Layout::define_section_symbols(Symbol_table* symtab, const Target* target)
                                        elfcpp::STV_DEFAULT,
                                        0, // nonvis
                                        false, // offset_is_from_end
-                                       false); // only_if_ref
+                                       true); // only_if_ref
 
-         symtab->define_in_output_data(target,
-                                       stop_name.c_str(),
+         symtab->define_in_output_data(stop_name.c_str(),
                                        NULL, // version
                                        *p,
                                        0, // value
@@ -593,9 +835,40 @@ Layout::define_section_symbols(Symbol_table* symtab, const Target* target)
                                        elfcpp::STV_DEFAULT,
                                        0, // nonvis
                                        true, // offset_is_from_end
-                                       false); // only_if_ref
+                                       true); // only_if_ref
+       }
+    }
+}
+
+// Define symbols for group signatures.
+
+void
+Layout::define_group_signatures(Symbol_table* symtab)
+{
+  for (Group_signatures::iterator p = this->group_signatures_.begin();
+       p != this->group_signatures_.end();
+       ++p)
+    {
+      Symbol* sym = symtab->lookup(p->signature, NULL);
+      if (sym != NULL)
+       p->section->set_info_symndx(sym);
+      else
+       {
+         // Force the name of the group section to the group
+         // signature, and use the group's section symbol as the
+         // signature symbol.
+         if (strcmp(p->section->name(), p->signature) != 0)
+           {
+             const char* name = this->namepool_.add(p->signature,
+                                                    true, NULL);
+             p->section->set_name(name);
+           }
+         p->section->set_needs_symtab_index();
+         p->section->set_info_section_symndx(p->section);
        }
     }
+
+  this->group_signatures_.clear();
 }
 
 // Find the first read-only PT_LOAD segment, creating one if
@@ -614,8 +887,10 @@ Layout::find_first_load_seg()
        return *p;
     }
 
-  Output_segment* load_seg = new Output_segment(elfcpp::PT_LOAD, elfcpp::PF_R);
-  this->segment_list_.push_back(load_seg);
+  gold_assert(!this->script_options_->saw_phdrs_clause());
+
+  Output_segment* load_seg = this->make_output_segment(elfcpp::PT_LOAD,
+                                                      elfcpp::PF_R);
   return load_seg;
 }
 
@@ -652,38 +927,40 @@ Layout::find_first_load_seg()
 // This function returns the size of the output file.
 
 off_t
-Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
+Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab,
+                Target* target, const Task* task)
 {
-  Target* const target = input_objects->target();
-
   target->finalize_sections(this);
 
+  this->count_local_symbols(task, input_objects);
+
   this->create_gold_note();
   this->create_executable_stack_info(target);
 
   Output_segment* phdr_seg = NULL;
-  if (!parameters->doing_static_link())
+  if (!parameters->options().relocatable() && !parameters->doing_static_link())
     {
       // 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);
+      if (!this->script_options_->saw_phdrs_clause())
+       phdr_seg = this->make_output_segment(elfcpp::PT_PHDR, elfcpp::PF_R);
 
       // 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,
+      Versions versions(*this->script_options()->version_script_info(),
+                        &this->dynpool_);
+      this->create_dynamic_symtab(input_objects, 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.
-      if (!parameters->output_is_shared())
+      if (!parameters->options().shared())
         this->create_interp(target);
 
       // Finish the .dynamic section to hold the dynamic data, and put
@@ -700,23 +977,53 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
                                    dynamic_symbols, dynstr);
     }
 
-  // FIXME: Handle PT_GNU_STACK.
+  // If there is a SECTIONS clause, put all the input sections into
+  // the required order.
+  Output_segment* load_seg;
+  if (this->script_options_->saw_sections_clause())
+    load_seg = this->set_section_addresses_from_script(symtab);
+  else if (parameters->options().relocatable())
+    load_seg = NULL;
+  else
+    load_seg = this->find_first_load_seg();
+
+  if (this->options_.oformat_enum() != General_options::OBJECT_FORMAT_ELF)
+    load_seg = NULL;
 
-  Output_segment* load_seg = this->find_first_load_seg();
+  gold_assert(phdr_seg == NULL || load_seg != NULL);
 
   // Lay out the segment headers.
   Output_segment_headers* segment_headers;
-  segment_headers = new Output_segment_headers(this->segment_list_);
-  load_seg->add_initial_output_data(segment_headers);
-  this->special_output_list_.push_back(segment_headers);
-  if (phdr_seg != NULL)
-    phdr_seg->add_initial_output_data(segment_headers);
+  if (parameters->options().relocatable())
+    segment_headers = NULL;
+  else
+    {
+      segment_headers = new Output_segment_headers(this->segment_list_);
+      if (load_seg != NULL)
+       load_seg->add_initial_output_data(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(target, symtab, segment_headers);
-  load_seg->add_initial_output_data(file_header);
+  file_header = new Output_file_header(target, symtab, segment_headers,
+                                      this->options_.entry());
+  if (load_seg != NULL)
+    load_seg->add_initial_output_data(file_header);
+
   this->special_output_list_.push_back(file_header);
+  if (segment_headers != NULL)
+    this->special_output_list_.push_back(segment_headers);
+
+  if (this->script_options_->saw_phdrs_clause()
+      && !parameters->options().relocatable())
+    {
+      // Support use of FILEHDRS and PHDRS attachments in a PHDRS
+      // clause in a linker script.
+      Script_sections* ss = this->script_options_->script_sections();
+      ss->put_headers_in_phdrs(file_header, segment_headers);
+    }
 
   // We set the output section indexes in set_segment_offsets and
   // set_section_indexes.
@@ -724,16 +1031,32 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
 
   // 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);
+  off_t off;
+  if (!parameters->options().relocatable())
+    off = this->set_segment_offsets(target, load_seg, &shndx);
+  else
+    off = this->set_relocatable_section_offsets(file_header, &shndx);
+
+  // Set the file offsets of all the non-data sections we've seen so
+  // far which don't have to wait for the input sections.  We need
+  // this in order to finalize local symbols in non-allocated
+  // sections.
+  off = this->set_section_offsets(off, BEFORE_INPUT_SECTIONS_PASS);
 
   // Create the symbol table sections.
   this->create_symtab_sections(input_objects, symtab, &off);
+  if (!parameters->doing_static_link())
+    this->assign_local_dynsym_offsets(input_objects);
+
+  // Process any symbol assignments from a linker script.  This must
+  // be called after the symbol table has been finalized.
+  this->script_options_->finalize_symbols(symtab, this);
 
   // Create the .shstrtab section.
   Output_section* shstrtab_section = this->create_shstrtab();
 
-  // Set the file offsets of all the non-data sections which don't
-  // have to wait for the input sections.
+  // Set the file offsets of the rest of the non-data sections which
+  // don't have to wait for the input sections.
   off = this->set_section_offsets(off, BEFORE_INPUT_SECTIONS_PASS);
 
   // Now that all sections have been created, set the section indexes.
@@ -742,6 +1065,12 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
   // Create the section table header.
   this->create_shdrs(&off);
 
+  // If there are no sections which require postprocessing, we can
+  // handle the section names now, and avoid a resize later.
+  if (!this->any_postprocessing_sections_)
+    off = this->set_section_offsets(off,
+                                   STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS);
+
   file_header->set_section_info(this->section_headers_, shstrtab_section);
 
   // Now we know exactly where everything goes in the output file
@@ -759,7 +1088,7 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab)
 void
 Layout::create_gold_note()
 {
-  if (parameters->output_is_object())
+  if (parameters->options().relocatable())
     return;
 
   // Authorities all agree that the values in a .note field should
@@ -774,7 +1103,7 @@ Layout::create_gold_note()
   // .note.ABI-tag (as of version 1.6), so that's the one we go with
   // here.
 #ifdef GABI_FORMAT_FOR_DOTNOTE_SECTION   // This is not defined by default.
-  const int size = parameters->get_size();
+  const int size = parameters->target().get_size();
 #else
   const int size = 32;
 #endif
@@ -794,7 +1123,7 @@ Layout::create_gold_note()
   gold_assert(sizeof buffer >= notesz);
   memset(buffer, 0, notesz);
 
-  bool is_big_endian = parameters->is_big_endian();
+  bool is_big_endian = parameters->target().is_big_endian();
 
   if (size == 32)
     {
@@ -871,7 +1200,7 @@ Layout::create_executable_stack_info(const Target* target)
        is_stack_executable = false;
     }
 
-  if (parameters->output_is_object())
+  if (parameters->options().relocatable())
     {
       const char* name = this->namepool_.add(".note.GNU-stack", false, NULL);
       elfcpp::Elf_Xword flags = 0;
@@ -881,11 +1210,12 @@ Layout::create_executable_stack_info(const Target* target)
     }
   else
     {
+      if (this->script_options_->saw_phdrs_clause())
+       return;
       int flags = elfcpp::PF_R | elfcpp::PF_W;
       if (is_stack_executable)
        flags |= elfcpp::PF_X;
-      Output_segment* oseg = new Output_segment(elfcpp::PT_GNU_STACK, flags);
-      this->segment_list_.push_back(oseg);
+      this->make_output_segment(elfcpp::PT_GNU_STACK, flags);
     }
 }
 
@@ -948,29 +1278,48 @@ Layout::segment_precedes(const Output_segment* seg1,
       return flags1 < flags2;
     }
 
+  // If the addresses are set already, sort by load address.
+  if (seg1->are_addresses_set())
+    {
+      if (!seg2->are_addresses_set())
+       return true;
+
+      unsigned int section_count1 = seg1->output_section_count();
+      unsigned int section_count2 = seg2->output_section_count();
+      if (section_count1 == 0 && section_count2 > 0)
+       return true;
+      if (section_count1 > 0 && section_count2 == 0)
+       return false;
+
+      uint64_t paddr1 = seg1->first_section_load_address();
+      uint64_t paddr2 = seg2->first_section_load_address();
+      if (paddr1 != paddr2)
+       return paddr1 < paddr2;
+    }
+  else if (seg2->are_addresses_set())
+    return false;
+
   // We sort PT_LOAD segments based on the flags.  Readonly segments
-  // come before writable segments.  Then executable segments come
-  // before non-executable segments.  Then the unlikely case of a
-  // non-readable segment comes before the normal case of a readable
-  // segment.  If there are multiple segments with the same type and
-  // flags, we require that the address be set, and we sort by
-  // virtual address and then physical address.
+  // come before writable segments.  Then writable segments with data
+  // come before writable segments without data.  Then executable
+  // segments come before non-executable segments.  Then the unlikely
+  // case of a non-readable segment comes before the normal case of a
+  // readable segment.  If there are multiple segments with the same
+  // type and flags, we require that the address be set, and we sort
+  // by virtual address and then physical address.
   if ((flags1 & elfcpp::PF_W) != (flags2 & elfcpp::PF_W))
     return (flags1 & elfcpp::PF_W) == 0;
+  if ((flags1 & elfcpp::PF_W) != 0
+      && seg1->has_any_data_sections() != seg2->has_any_data_sections())
+    return seg1->has_any_data_sections();
   if ((flags1 & elfcpp::PF_X) != (flags2 & elfcpp::PF_X))
     return (flags1 & elfcpp::PF_X) != 0;
   if ((flags1 & elfcpp::PF_R) != (flags2 & elfcpp::PF_R))
     return (flags1 & elfcpp::PF_R) == 0;
 
-  uint64_t vaddr1 = seg1->vaddr();
-  uint64_t vaddr2 = seg2->vaddr();
-  if (vaddr1 != vaddr2)
-    return vaddr1 < vaddr2;
-
-  uint64_t paddr1 = seg1->paddr();
-  uint64_t paddr2 = seg2->paddr();
-  gold_assert(paddr1 != paddr2);
-  return paddr1 < paddr2;
+  // We shouldn't get here--we shouldn't create segments which we
+  // can't distinguish.
+  gold_unreachable();
 }
 
 // Set the file offsets of all the segments, and all the sections they
@@ -988,11 +1337,29 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
   // Find the PT_LOAD segments, and set their addresses and offsets
   // and their section's addresses and offsets.
   uint64_t addr;
-  if (options_.user_set_text_segment_address())
-    addr = options_.text_segment_address();
+  if (this->options_.user_set_Ttext())
+    addr = this->options_.Ttext();
+  else if (parameters->options().shared())
+    addr = 0;
   else
     addr = target->default_text_segment_address();
   off_t off = 0;
+
+  // If LOAD_SEG is NULL, then the file header and segment headers
+  // will not be loadable.  But they still need to be at offset 0 in
+  // the file.  Set their offsets now.
+  if (load_seg == NULL)
+    {
+      for (Data_list::iterator p = this->special_output_list_.begin();
+          p != this->special_output_list_.end();
+          ++p)
+       {
+         off = align_address(off, (*p)->addralign());
+         (*p)->set_address_and_file_offset(0, off);
+         off += (*p)->data_size();
+       }
+    }
+
   bool was_readonly = false;
   for (Segment_list::iterator p = this->segment_list_.begin();
        p != this->segment_list_.end();
@@ -1004,34 +1371,73 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
            gold_unreachable();
          load_seg = NULL;
 
-         // If the last segment was readonly, and this one is not,
-         // then skip the address forward one page, maintaining the
-         // same position within the page.  This lets us store both
-         // segments overlapping on a single page in the file, but
-         // the loader will put them on different pages in memory.
+         bool are_addresses_set = (*p)->are_addresses_set();
+         if (are_addresses_set)
+           {
+             // When it comes to setting file offsets, we care about
+             // the physical address.
+             addr = (*p)->paddr();
+           }
+         else if (this->options_.user_set_Tdata()
+                  && ((*p)->flags() & elfcpp::PF_W) != 0
+                  && (!this->options_.user_set_Tbss()
+                      || (*p)->has_any_data_sections()))
+           {
+             addr = this->options_.Tdata();
+             are_addresses_set = true;
+           }
+         else if (this->options_.user_set_Tbss()
+                  && ((*p)->flags() & elfcpp::PF_W) != 0
+                  && !(*p)->has_any_data_sections())
+           {
+             addr = this->options_.Tbss();
+             are_addresses_set = true;
+           }
 
          uint64_t orig_addr = addr;
          uint64_t orig_off = off;
 
-         uint64_t aligned_addr = addr;
+         uint64_t aligned_addr = 0;
          uint64_t abi_pagesize = target->abi_pagesize();
 
-          // FIXME: This should depend on the -n and -N options.
-          (*p)->set_minimum_addralign(target->common_pagesize());
+         // FIXME: This should depend on the -n and -N options.
+         (*p)->set_minimum_p_align(target->common_pagesize());
 
-         if (was_readonly && ((*p)->flags() & elfcpp::PF_W) != 0)
+         if (are_addresses_set)
            {
-             uint64_t align = (*p)->addralign();
-
-             addr = align_address(addr, align);
+             // Adjust the file offset to the same address modulo the
+             // page size.
+             uint64_t unsigned_off = off;
+             uint64_t aligned_off = ((unsigned_off & ~(abi_pagesize - 1))
+                                     | (addr & (abi_pagesize - 1)));
+             if (aligned_off < unsigned_off)
+               aligned_off += abi_pagesize;
+             off = aligned_off;
+           }
+         else
+           {
+             // If the last segment was readonly, and this one is
+             // not, then skip the address forward one page,
+             // maintaining the same position within the page.  This
+             // lets us store both segments overlapping on a single
+             // page in the file, but the loader will put them on
+             // different pages in memory.
+
+             addr = align_address(addr, (*p)->maximum_alignment());
              aligned_addr = addr;
-             if ((addr & (abi_pagesize - 1)) != 0)
-               addr = addr + abi_pagesize;
+
+             if (was_readonly && ((*p)->flags() & elfcpp::PF_W) != 0)
+               {
+                 if ((addr & (abi_pagesize - 1)) != 0)
+                   addr = addr + abi_pagesize;
+               }
+
+             off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1));
            }
 
          unsigned int shndx_hold = *pshndx;
-         off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1));
-         uint64_t new_addr = (*p)->set_section_addresses(addr, &off, pshndx);
+         uint64_t new_addr = (*p)->set_section_addresses(false, 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
@@ -1039,7 +1445,7 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
          // page.  Here we use the real machine page size rather than
          // the ABI mandated page size.
 
-         if (aligned_addr != addr)
+         if (!are_addresses_set && aligned_addr != addr)
            {
              uint64_t common_pagesize = target->common_pagesize();
              uint64_t first_off = (common_pagesize
@@ -1054,8 +1460,10 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
                {
                  *pshndx = shndx_hold;
                  addr = align_address(aligned_addr, common_pagesize);
+                 addr = align_address(addr, (*p)->maximum_alignment());
                  off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1));
-                 new_addr = (*p)->set_section_addresses(addr, &off, pshndx);
+                 new_addr = (*p)->set_section_addresses(true, addr, &off,
+                                                        pshndx);
                }
            }
 
@@ -1076,6 +1484,49 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
        (*p)->set_offset();
     }
 
+  // Set the TLS offsets for each section in the PT_TLS segment.
+  if (this->tls_segment_ != NULL)
+    this->tls_segment_->set_tls_offsets();
+
+  return off;
+}
+
+// Set the offsets of all the allocated sections when doing a
+// relocatable link.  This does the same jobs as set_segment_offsets,
+// only for a relocatable link.
+
+off_t
+Layout::set_relocatable_section_offsets(Output_data* file_header,
+                                       unsigned int *pshndx)
+{
+  off_t off = 0;
+
+  file_header->set_address_and_file_offset(0, 0);
+  off += file_header->data_size();
+
+  for (Section_list::iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    {
+      // We skip unallocated sections here, except that group sections
+      // have to come first.
+      if (((*p)->flags() & elfcpp::SHF_ALLOC) == 0
+         && (*p)->type() != elfcpp::SHT_GROUP)
+       continue;
+
+      off = align_address(off, (*p)->addralign());
+
+      // The linker script might have set the address.
+      if (!(*p)->is_address_valid())
+       (*p)->set_address(0);
+      (*p)->set_file_offset(off);
+      (*p)->finalize_data_size();
+      off += (*p)->data_size();
+
+      (*p)->set_out_shndx(*pshndx);
+      ++*pshndx;
+    }
+
   return off;
 }
 
@@ -1093,18 +1544,25 @@ Layout::set_section_offsets(off_t off, Layout::Section_offset_pass pass)
       if (*p == this->symtab_section_)
        continue;
 
+      // If we've already set the data size, don't set it again.
+      if ((*p)->is_offset_valid() && (*p)->is_data_size_valid())
+       continue;
+
       if (pass == BEFORE_INPUT_SECTIONS_PASS
          && (*p)->requires_postprocessing())
-       (*p)->create_postprocessing_buffer();
+       {
+         (*p)->create_postprocessing_buffer();
+         this->any_postprocessing_sections_ = true;
+       }
 
       if (pass == BEFORE_INPUT_SECTIONS_PASS
           && (*p)->after_input_sections())
         continue;
-      else if (pass == AFTER_INPUT_SECTIONS_PASS
+      else if (pass == POSTPROCESSING_SECTIONS_PASS
                && (!(*p)->after_input_sections()
                    || (*p)->type() == elfcpp::SHT_STRTAB))
         continue;
-      else if (pass == STRTAB_AFTER_INPUT_SECTIONS_PASS
+      else if (pass == STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS
                && (!(*p)->after_input_sections()
                    || (*p)->type() != elfcpp::SHT_STRTAB))
         continue;
@@ -1115,7 +1573,7 @@ Layout::set_section_offsets(off_t off, Layout::Section_offset_pass pass)
       off += (*p)->data_size();
 
       // At this point the name must be set.
-      if (pass != STRTAB_AFTER_INPUT_SECTIONS_PASS)
+      if (pass != STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS)
        this->namepool_.add((*p)->name(), false, NULL);
     }
   return off;
@@ -1127,16 +1585,81 @@ Layout::set_section_offsets(off_t off, Layout::Section_offset_pass pass)
 unsigned int
 Layout::set_section_indexes(unsigned int shndx)
 {
+  const bool output_is_object = parameters->options().relocatable();
   for (Section_list::iterator p = this->unattached_section_list_.begin();
        p != this->unattached_section_list_.end();
        ++p)
     {
+      // In a relocatable link, we already did group sections.
+      if (output_is_object
+         && (*p)->type() == elfcpp::SHT_GROUP)
+       continue;
+
       (*p)->set_out_shndx(shndx);
       ++shndx;
     }
   return shndx;
 }
 
+// Set the section addresses according to the linker script.  This is
+// only called when we see a SECTIONS clause.  This returns the
+// program segment which should hold the file header and segment
+// headers, if any.  It will return NULL if they should not be in a
+// segment.
+
+Output_segment*
+Layout::set_section_addresses_from_script(Symbol_table* symtab)
+{
+  Script_sections* ss = this->script_options_->script_sections();
+  gold_assert(ss->saw_sections_clause());
+
+  // Place each orphaned output section in the script.
+  for (Section_list::iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    {
+      if (!(*p)->found_in_sections_clause())
+       ss->place_orphan(*p);
+    }
+
+  return this->script_options_->set_section_addresses(symtab, this);
+}
+
+// Count the local symbols in the regular symbol table and the dynamic
+// symbol table, and build the respective string pools.
+
+void
+Layout::count_local_symbols(const Task* task,
+                           const Input_objects* input_objects)
+{
+  // First, figure out an upper bound on the number of symbols we'll
+  // be inserting into each pool.  This helps us create the pools with
+  // the right size, to avoid unnecessary hashtable resizing.
+  unsigned int symbol_count = 0;
+  for (Input_objects::Relobj_iterator p = input_objects->relobj_begin();
+       p != input_objects->relobj_end();
+       ++p)
+    symbol_count += (*p)->local_symbol_count();
+
+  // Go from "upper bound" to "estimate."  We overcount for two
+  // reasons: we double-count symbols that occur in more than one
+  // object file, and we count symbols that are dropped from the
+  // output.  Add it all together and assume we overcount by 100%.
+  symbol_count /= 2;
+
+  // We assume all symbols will go into both the sympool and dynpool.
+  this->sympool_.reserve(symbol_count);
+  this->dynpool_.reserve(symbol_count);
+
+  for (Input_objects::Relobj_iterator p = input_objects->relobj_begin();
+       p != input_objects->relobj_end();
+       ++p)
+    {
+      Task_lock_obj<Object> tlo(task, *p);
+      (*p)->count_local_symbols(&this->sympool_, &this->dynpool_);
+    }
+}
+
 // 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.
@@ -1148,12 +1671,12 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
 {
   int symsize;
   unsigned int align;
-  if (parameters->get_size() == 32)
+  if (parameters->target().get_size() == 32)
     {
       symsize = elfcpp::Elf_sizes<32>::sym_size;
       align = 4;
     }
-  else if (parameters->get_size() == 64)
+  else if (parameters->target().get_size() == 64)
     {
       symsize = elfcpp::Elf_sizes<64>::sym_size;
       align = 8;
@@ -1189,10 +1712,8 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
        p != input_objects->relobj_end();
        ++p)
     {
-      Task_lock_obj<Object> tlo(**p);
       unsigned int index = (*p)->finalize_local_symbols(local_symbol_index,
-                                                       off,
-                                                       &this->sympool_);
+                                                        off);
       off += (index - local_symbol_index) * symsize;
       local_symbol_index = index;
     }
@@ -1219,10 +1740,10 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
                  == this->dynsym_section_->data_size() - locsize);
     }
 
-  off = symtab->finalize(local_symcount, off, dynoff, dyn_global_index,
-                        dyncount, &this->sympool_);
+  off = symtab->finalize(off, dynoff, dyn_global_index, dyncount,
+                        &this->sympool_, &local_symcount);
 
-  if (!parameters->strip_all())
+  if (!parameters->options().strip_all())
     {
       this->sympool_.set_string_offsets();
 
@@ -1288,6 +1809,7 @@ Layout::create_shdrs(off_t* poff)
   Output_section_headers* oshdrs;
   oshdrs = new Output_section_headers(this,
                                      &this->segment_list_,
+                                     &this->section_list_,
                                      &this->unattached_section_list_,
                                      &this->namepool_);
   off_t off = align_address(*poff, oshdrs->addralign());
@@ -1300,7 +1822,8 @@ Layout::create_shdrs(off_t* poff)
 // Create the dynamic symbol table.
 
 void
-Layout::create_dynamic_symtab(const Target* target, Symbol_table* symtab,
+Layout::create_dynamic_symtab(const Input_objects* input_objects,
+                              Symbol_table* symtab,
                              Output_section **pdynstr,
                              unsigned int* plocal_dynamic_count,
                              std::vector<Symbol*>* pdynamic_symbols,
@@ -1326,22 +1849,27 @@ Layout::create_dynamic_symtab(const Target* target, Symbol_table* symtab,
        }
     }
 
-  // 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_.
+  // Count the local symbols that need to go in the dynamic symbol table,
+  // and set the dynamic symbol indexes.
+  for (Input_objects::Relobj_iterator p = input_objects->relobj_begin();
+       p != input_objects->relobj_end();
+       ++p)
+    {
+      unsigned int new_index = (*p)->set_local_dynsym_indexes(index);
+      index = new_index;
+    }
 
   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(target, index, pdynamic_symbols,
+  index = symtab->set_dynsym_indexes(index, pdynamic_symbols,
                                     &this->dynpool_, pversions);
 
   int symsize;
   unsigned int align;
-  const int size = parameters->get_size();
+  const int size = parameters->target().get_size();
   if (size == 32)
     {
       symsize = elfcpp::Elf_sizes<32>::sym_size;
@@ -1357,10 +1885,10 @@ Layout::create_dynamic_symtab(const Target* target, Symbol_table* symtab,
 
   // Create the dynamic symbol table section.
 
-  const char* dynsym_name = this->namepool_.add(".dynsym", false, NULL);
-  Output_section* dynsym = this->make_output_section(dynsym_name,
-                                                    elfcpp::SHT_DYNSYM,
-                                                    elfcpp::SHF_ALLOC);
+  Output_section* dynsym = this->choose_output_section(NULL, ".dynsym",
+                                                      elfcpp::SHT_DYNSYM,
+                                                      elfcpp::SHF_ALLOC,
+                                                      false);
 
   Output_section_data* odata = new Output_data_fixed_space(index * symsize,
                                                           align);
@@ -1378,10 +1906,10 @@ Layout::create_dynamic_symtab(const Target* target, Symbol_table* symtab,
 
   // Create the dynamic string table section.
 
-  const char* dynstr_name = this->namepool_.add(".dynstr", false, NULL);
-  Output_section* dynstr = this->make_output_section(dynstr_name,
-                                                    elfcpp::SHT_STRTAB,
-                                                    elfcpp::SHF_ALLOC);
+  Output_section* dynstr = this->choose_output_section(NULL, ".dynstr",
+                                                      elfcpp::SHT_STRTAB,
+                                                      elfcpp::SHF_ALLOC,
+                                                      false);
 
   Output_section_data* strdata = new Output_data_strtab(&this->dynpool_);
   dynstr->add_output_section_data(strdata);
@@ -1403,10 +1931,10 @@ Layout::create_dynamic_symtab(const Target* target, Symbol_table* symtab,
   Dynobj::create_elf_hash_table(*pdynamic_symbols, local_symcount,
                                &phash, &hashlen);
 
-  const char* hash_name = this->namepool_.add(".hash", false, NULL);
-  Output_section* hashsec = this->make_output_section(hash_name,
-                                                     elfcpp::SHT_HASH,
-                                                     elfcpp::SHF_ALLOC);
+  Output_section* hashsec = this->choose_output_section(NULL, ".hash",
+                                                       elfcpp::SHT_HASH,
+                                                       elfcpp::SHF_ALLOC,
+                                                       false);
 
   Output_section_data* hashdata = new Output_data_const_buffer(phash,
                                                               hashlen,
@@ -1419,6 +1947,28 @@ Layout::create_dynamic_symtab(const Target* target, Symbol_table* symtab,
   odyn->add_section_address(elfcpp::DT_HASH, hashsec);
 }
 
+// Assign offsets to each local portion of the dynamic symbol table.
+
+void
+Layout::assign_local_dynsym_offsets(const Input_objects* input_objects)
+{
+  Output_section* dynsym = this->dynsym_section_;
+  gold_assert(dynsym != NULL);
+
+  off_t off = dynsym->offset();
+
+  // Skip the dummy symbol at the start of the section.
+  off += dynsym->entsize();
+
+  for (Input_objects::Relobj_iterator p = input_objects->relobj_begin();
+       p != input_objects->relobj_end();
+       ++p)
+    {
+      unsigned int count = (*p)->set_local_dynsym_offset(off);
+      off += count * dynsym->entsize();
+    }
+}
+
 // Create the version sections.
 
 void
@@ -1431,58 +1981,39 @@ Layout::create_version_sections(const Versions* versions,
   if (!versions->any_defs() && !versions->any_needs())
     return;
 
-  if (parameters->get_size() == 32)
+  switch (parameters->size_and_endianness())
     {
-      if (parameters->is_big_endian())
-        {
-#ifdef HAVE_TARGET_32_BIG
-          this->sized_create_version_sections
-              SELECT_SIZE_ENDIAN_NAME(32, true)(
-                 versions, symtab, 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, symtab, local_symcount, dynamic_symbols, dynstr
-                  SELECT_SIZE_ENDIAN(32, false));
-#else
-          gold_unreachable();
+    case Parameters::TARGET_32_LITTLE:
+      this->sized_create_version_sections<32, false>(versions, symtab,
+                                                    local_symcount,
+                                                    dynamic_symbols, dynstr);
+      break;
 #endif
-        }
-    }
-  else if (parameters->get_size() == 64)
-    {
-      if (parameters->is_big_endian())
-        {
-#ifdef HAVE_TARGET_64_BIG
-          this->sized_create_version_sections
-              SELECT_SIZE_ENDIAN_NAME(64, true)(
-                  versions, symtab, local_symcount, dynamic_symbols, dynstr
-                  SELECT_SIZE_ENDIAN(64, true));
-#else
-          gold_unreachable();
+#ifdef HAVE_TARGET_32_BIG
+    case Parameters::TARGET_32_BIG:
+      this->sized_create_version_sections<32, true>(versions, symtab,
+                                                   local_symcount,
+                                                   dynamic_symbols, dynstr);
+      break;
 #endif
-        }
-      else
-        {
 #ifdef HAVE_TARGET_64_LITTLE
-          this->sized_create_version_sections
-              SELECT_SIZE_ENDIAN_NAME(64, false)(
-                  versions, symtab, local_symcount, dynamic_symbols, dynstr
-                  SELECT_SIZE_ENDIAN(64, false));
-#else
-          gold_unreachable();
+    case Parameters::TARGET_64_LITTLE:
+      this->sized_create_version_sections<64, false>(versions, symtab,
+                                                    local_symcount,
+                                                    dynamic_symbols, dynstr);
+      break;
 #endif
-        }
+#ifdef HAVE_TARGET_64_BIG
+    case Parameters::TARGET_64_BIG:
+      this->sized_create_version_sections<64, true>(versions, symtab,
+                                                   local_symcount,
+                                                   dynamic_symbols, dynstr);
+      break;
+#endif
+    default:
+      gold_unreachable();
     }
-  else
-    gold_unreachable();
 }
 
 // Create the version sections, sized version.
@@ -1494,19 +2025,19 @@ Layout::sized_create_version_sections(
     const Symbol_table* symtab,
     unsigned int local_symcount,
     const std::vector<Symbol*>& dynamic_symbols,
-    const Output_section* dynstr
-    ACCEPT_SIZE_ENDIAN)
+    const Output_section* dynstr)
 {
-  const char* vname = this->namepool_.add(".gnu.version", false, NULL);
-  Output_section* vsec = this->make_output_section(vname,
-                                                  elfcpp::SHT_GNU_versym,
-                                                  elfcpp::SHF_ALLOC);
+  Output_section* vsec = this->choose_output_section(NULL, ".gnu.version",
+                                                    elfcpp::SHT_GNU_versym,
+                                                    elfcpp::SHF_ALLOC,
+                                                    false);
 
   unsigned char* vbuf;
   unsigned int vsize;
-  versions->symbol_section_contents SELECT_SIZE_ENDIAN_NAME(size, big_endian)(
-      symtab, &this->dynpool_, local_symcount, dynamic_symbols, &vbuf, &vsize
-      SELECT_SIZE_ENDIAN(size, big_endian));
+  versions->symbol_section_contents<size, big_endian>(symtab, &this->dynpool_,
+                                                     local_symcount,
+                                                     dynamic_symbols,
+                                                     &vbuf, &vsize);
 
   Output_section_data* vdata = new Output_data_const_buffer(vbuf, vsize, 2);
 
@@ -1519,17 +2050,17 @@ Layout::sized_create_version_sections(
 
   if (versions->any_defs())
     {
-      const char* vdname = this->namepool_.add(".gnu.version_d", false, NULL);
-      Output_section *vdsec;
-      vdsec = this->make_output_section(vdname, elfcpp::SHT_GNU_verdef,
-                                       elfcpp::SHF_ALLOC);
+      Output_section* vdsec;
+      vdsec= this->choose_output_section(NULL, ".gnu.version_d",
+                                        elfcpp::SHT_GNU_verdef,
+                                        elfcpp::SHF_ALLOC,
+                                        false);
 
       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));
+      versions->def_section_contents<size, big_endian>(&this->dynpool_, &vdbuf,
+                                                      &vdsize, &vdentries);
 
       Output_section_data* vddata = new Output_data_const_buffer(vdbuf,
                                                                 vdsize,
@@ -1545,17 +2076,18 @@ Layout::sized_create_version_sections(
 
   if (versions->any_needs())
     {
-      const char* vnname = this->namepool_.add(".gnu.version_r", false, NULL);
       Output_section* vnsec;
-      vnsec = this->make_output_section(vnname, elfcpp::SHT_GNU_verneed,
-                                       elfcpp::SHF_ALLOC);
+      vnsec = this->choose_output_section(NULL, ".gnu.version_r",
+                                         elfcpp::SHT_GNU_verneed,
+                                         elfcpp::SHF_ALLOC,
+                                         false);
 
       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));
+      versions->need_section_contents<size, big_endian>(&this->dynpool_,
+                                                       &vnbuf, &vnsize,
+                                                       &vnentries);
 
       Output_section_data* vndata = new Output_data_const_buffer(vnbuf,
                                                                 vnsize,
@@ -1586,15 +2118,18 @@ Layout::create_interp(const Target* target)
 
   Output_section_data* odata = new Output_data_const(interp, len, 1);
 
-  const char* interp_name = this->namepool_.add(".interp", false, NULL);
-  Output_section* osec = this->make_output_section(interp_name,
-                                                  elfcpp::SHT_PROGBITS,
-                                                  elfcpp::SHF_ALLOC);
+  Output_section* osec = this->choose_output_section(NULL, ".interp",
+                                                    elfcpp::SHT_PROGBITS,
+                                                    elfcpp::SHF_ALLOC,
+                                                    false);
   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);
+  if (!this->script_options_->saw_phdrs_clause())
+    {
+      Output_segment* oseg = this->make_output_segment(elfcpp::PT_INTERP,
+                                                      elfcpp::PF_R);
+      oseg->add_initial_output_section(osec, elfcpp::PF_R);
+    }
 }
 
 // Finish the .dynamic section and PT_DYNAMIC segment.
@@ -1603,11 +2138,14 @@ 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);
+  if (!this->script_options_->saw_phdrs_clause())
+    {
+      Output_segment* oseg = this->make_output_segment(elfcpp::PT_DYNAMIC,
+                                                      (elfcpp::PF_R
+                                                       | elfcpp::PF_W));
+      oseg->add_initial_output_section(this->dynamic_section_,
+                                      elfcpp::PF_R | elfcpp::PF_W);
+    }
 
   Output_data_dynamic* const odyn = this->dynamic_data_;
 
@@ -1619,6 +2157,13 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
       odyn->add_string(elfcpp::DT_NEEDED, (*p)->soname());
     }
 
+  if (parameters->options().shared())
+    {
+      const char* soname = this->options_.soname();
+      if (soname != NULL)
+       odyn->add_string(elfcpp::DT_SONAME, soname);
+    }
+
   // FIXME: Support --init and --fini.
   Symbol* sym = symtab->lookup("_init");
   if (sym != NULL && sym->is_defined() && !sym->is_from_dynobj())
@@ -1661,23 +2206,51 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
 
   // Look for text segments that have dynamic relocations.
   bool have_textrel = false;
-  for (Segment_list::const_iterator p = this->segment_list_.begin();
-       p != this->segment_list_.end();
-       ++p)
+  if (!this->script_options_->saw_sections_clause())
     {
-      if (((*p)->flags() & elfcpp::PF_W) == 0
-         && (*p)->dynamic_reloc_count() > 0)
-       {
-         have_textrel = true;
-         break;
-       }
+      for (Segment_list::const_iterator p = this->segment_list_.begin();
+           p != this->segment_list_.end();
+           ++p)
+        {
+          if (((*p)->flags() & elfcpp::PF_W) == 0
+              && (*p)->dynamic_reloc_count() > 0)
+            {
+              have_textrel = true;
+              break;
+            }
+        }
+    }
+  else
+    {
+      // We don't know the section -> segment mapping, so we are
+      // conservative and just look for readonly sections with
+      // relocations.  If those sections wind up in writable segments,
+      // then we have created an unnecessary DT_TEXTREL entry.
+      for (Section_list::const_iterator p = this->section_list_.begin();
+           p != this->section_list_.end();
+           ++p)
+        {
+          if (((*p)->flags() & elfcpp::SHF_ALLOC) != 0
+              && ((*p)->flags() & elfcpp::SHF_WRITE) == 0
+              && ((*p)->dynamic_reloc_count() > 0))
+            {
+              have_textrel = true;
+              break;
+            }
+        }
     }
 
   // Add a DT_FLAGS entry. We add it even if no flags are set so that
   // post-link tools can easily modify these flags if desired.
   unsigned int flags = 0;
   if (have_textrel)
-    flags |= elfcpp::DF_TEXTREL;
+    {
+      // Add a DT_TEXTREL for compatibility with older loaders.
+      odyn->add_constant(elfcpp::DT_TEXTREL, 0);
+      flags |= elfcpp::DF_TEXTREL;
+    }
+  if (parameters->options().shared() && this->has_static_tls())
+    flags |= elfcpp::DF_STATIC_TLS;
   odyn->add_constant(elfcpp::DT_FLAGS, flags);
 }
 
@@ -1854,6 +2427,29 @@ Layout::add_comdat(const char* signature, bool group)
     }
 }
 
+// Store the allocated sections into the section list.
+
+void
+Layout::get_allocated_sections(Section_list* section_list) const
+{
+  for (Section_list::const_iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    if (((*p)->flags() & elfcpp::SHF_ALLOC) != 0)
+      section_list->push_back(*p);
+}
+
+// Create an output segment.
+
+Output_segment*
+Layout::make_output_segment(elfcpp::Elf_Word type, elfcpp::Elf_Word flags)
+{
+  gold_assert(!parameters->options().relocatable());
+  Output_segment* oseg = new Output_segment(type, flags);
+  this->segment_list_.push_back(oseg);
+  return oseg;
+}
+
 // 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.
@@ -1875,7 +2471,7 @@ Layout::write_output_sections(Output_file* of) const
 void
 Layout::write_data(const Symbol_table* symtab, Output_file* of) const
 {
-  if (!parameters->strip_all())
+  if (!parameters->options().strip_all())
     {
       const Output_section* symtab_section = this->symtab_section_;
       for (Section_list::const_iterator p = this->section_list_.begin();
@@ -1927,16 +2523,21 @@ Layout::write_sections_after_input_sections(Output_file* of)
   // file size.  Note we finalize the .shstrab last, to allow the
   // after_input_section sections to modify their section-names before
   // writing.
-  off_t off = this->output_file_size_;
-  off = this->set_section_offsets(off, AFTER_INPUT_SECTIONS_PASS);
-
-  // Now that we've finalized the names, we can finalize the shstrab.
-  off = this->set_section_offsets(off, STRTAB_AFTER_INPUT_SECTIONS_PASS);
-
-  if (off > this->output_file_size_)
+  if (this->any_postprocessing_sections_)
     {
-      of->resize(off);
-      this->output_file_size_ = off;
+      off_t off = this->output_file_size_;
+      off = this->set_section_offsets(off, POSTPROCESSING_SECTIONS_PASS);
+      
+      // Now that we've finalized the names, we can finalize the shstrab.
+      off =
+       this->set_section_offsets(off,
+                                 STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS);
+
+      if (off > this->output_file_size_)
+       {
+         of->resize(off);
+         this->output_file_size_ = off;
+       }
     }
 
   for (Section_list::const_iterator p = this->section_list_.begin();
@@ -1947,15 +2548,56 @@ Layout::write_sections_after_input_sections(Output_file* of)
        (*p)->write(of);
     }
 
-  for (Section_list::const_iterator p = this->unattached_section_list_.begin();
-       p != this->unattached_section_list_.end();
+  this->section_headers_->write(of);
+}
+
+// Write out a binary file.  This is called after the link is
+// complete.  IN is the temporary output file we used to generate the
+// ELF code.  We simply walk through the segments, read them from
+// their file offset in IN, and write them to their load address in
+// the output file.  FIXME: with a bit more work, we could support
+// S-records and/or Intel hex format here.
+
+void
+Layout::write_binary(Output_file* in) const
+{
+  gold_assert(this->options_.oformat_enum()
+             == General_options::OBJECT_FORMAT_BINARY);
+
+  // Get the size of the binary file.
+  uint64_t max_load_address = 0;
+  for (Segment_list::const_iterator p = this->segment_list_.begin();
+       p != this->segment_list_.end();
        ++p)
     {
-      if ((*p)->after_input_sections())
-       (*p)->write(of);
+      if ((*p)->type() == elfcpp::PT_LOAD && (*p)->filesz() > 0)
+       {
+         uint64_t max_paddr = (*p)->paddr() + (*p)->filesz();
+         if (max_paddr > max_load_address)
+           max_load_address = max_paddr;
+       }
     }
 
-  this->section_headers_->write(of);
+  Output_file out(parameters->options().output_file_name());
+  out.open(max_load_address);
+
+  for (Segment_list::const_iterator p = this->segment_list_.begin();
+       p != this->segment_list_.end();
+       ++p)
+    {
+      if ((*p)->type() == elfcpp::PT_LOAD && (*p)->filesz() > 0)
+       {
+         const unsigned char* vin = in->get_input_view((*p)->offset(),
+                                                       (*p)->filesz());
+         unsigned char* vout = out.get_output_view((*p)->paddr(),
+                                                   (*p)->filesz());
+         memcpy(vout, vin, (*p)->filesz());
+         out.write_output_view((*p)->paddr(), (*p)->filesz(), vout);
+         in->free_input_view((*p)->offset(), (*p)->filesz(), vin);
+       }
+    }
+
+  out.close();
 }
 
 // Print statistical information to stderr.  This is used for --stats.
@@ -1966,42 +2608,31 @@ Layout::print_stats() const
   this->namepool_.print_stats("section name pool");
   this->sympool_.print_stats("output symbol name pool");
   this->dynpool_.print_stats("dynamic name pool");
+
+  for (Section_list::const_iterator p = this->section_list_.begin();
+       p != this->section_list_.end();
+       ++p)
+    (*p)->print_merge_stats();
 }
 
 // Write_sections_task methods.
 
 // We can always run this task.
 
-Task::Is_runnable_type
-Write_sections_task::is_runnable(Workqueue*)
+Task_token*
+Write_sections_task::is_runnable()
 {
-  return IS_RUNNABLE;
+  return NULL;
 }
 
 // We need to unlock both OUTPUT_SECTIONS_BLOCKER and FINAL_BLOCKER
 // when finished.
 
-class Write_sections_task::Write_sections_locker : public Task_locker
-{
- public:
-  Write_sections_locker(Task_token& output_sections_blocker,
-                       Task_token& final_blocker,
-                       Workqueue* workqueue)
-    : output_sections_block_(output_sections_blocker, workqueue),
-      final_block_(final_blocker, workqueue)
-  { }
-
- private:
-  Task_block_token output_sections_block_;
-  Task_block_token final_block_;
-};
-
-Task_locker*
-Write_sections_task::locks(Workqueue* workqueue)
+void
+Write_sections_task::locks(Task_locker* tl)
 {
-  return new Write_sections_locker(*this->output_sections_blocker_,
-                                  *this->final_blocker_,
-                                  workqueue);
+  tl->add(this, this->output_sections_blocker_);
+  tl->add(this, this->final_blocker_);
 }
 
 // Run the task--write out the data.
@@ -2016,18 +2647,18 @@ Write_sections_task::run(Workqueue*)
 
 // We can always run this task.
 
-Task::Is_runnable_type
-Write_data_task::is_runnable(Workqueue*)
+Task_token*
+Write_data_task::is_runnable()
 {
-  return IS_RUNNABLE;
+  return NULL;
 }
 
 // We need to unlock FINAL_BLOCKER when finished.
 
-Task_locker*
-Write_data_task::locks(Workqueue* workqueue)
+void
+Write_data_task::locks(Task_locker* tl)
 {
-  return new Task_locker_block(*this->final_blocker_, workqueue);
+  tl->add(this, this->final_blocker_);
 }
 
 // Run the task--write out the data.
@@ -2042,18 +2673,18 @@ Write_data_task::run(Workqueue*)
 
 // We can always run this task.
 
-Task::Is_runnable_type
-Write_symbols_task::is_runnable(Workqueue*)
+Task_token*
+Write_symbols_task::is_runnable()
 {
-  return IS_RUNNABLE;
+  return NULL;
 }
 
 // We need to unlock FINAL_BLOCKER when finished.
 
-Task_locker*
-Write_symbols_task::locks(Workqueue* workqueue)
+void
+Write_symbols_task::locks(Task_locker* tl)
 {
-  return new Task_locker_block(*this->final_blocker_, workqueue);
+  tl->add(this, this->final_blocker_);
 }
 
 // Run the task--write out the symbols.
@@ -2069,20 +2700,20 @@ Write_symbols_task::run(Workqueue*)
 
 // We can only run this task after the input sections have completed.
 
-Task::Is_runnable_type
-Write_after_input_sections_task::is_runnable(Workqueue*)
+Task_token*
+Write_after_input_sections_task::is_runnable()
 {
   if (this->input_sections_blocker_->is_blocked())
-    return IS_BLOCKED;
-  return IS_RUNNABLE;
+    return this->input_sections_blocker_;
+  return NULL;
 }
 
 // We need to unlock FINAL_BLOCKER when finished.
 
-Task_locker*
-Write_after_input_sections_task::locks(Workqueue* workqueue)
+void
+Write_after_input_sections_task::locks(Task_locker* tl)
 {
-  return new Task_locker_block(*this->final_blocker_, workqueue);
+  tl->add(this, this->final_blocker_);
 }
 
 // Run the task.
@@ -2098,8 +2729,12 @@ Write_after_input_sections_task::run(Workqueue*)
 // Run the task--close the file.
 
 void
-Close_task_runner::run(Workqueue*)
+Close_task_runner::run(Workqueue*, const Task*)
 {
+  // If we've been asked to create a binary file, we do so here.
+  if (this->options_->oformat_enum() != General_options::OBJECT_FORMAT_ELF)
+    this->layout_->write_binary(this->of_);
+
   this->of_->close();
 }
 
@@ -2145,6 +2780,94 @@ Layout::layout<64, true>(Sized_relobj<64, true>* object, unsigned int shndx,
 #ifdef HAVE_TARGET_32_LITTLE
 template
 Output_section*
+Layout::layout_reloc<32, false>(Sized_relobj<32, false>* object,
+                               unsigned int reloc_shndx,
+                               const elfcpp::Shdr<32, false>& shdr,
+                               Output_section* data_section,
+                               Relocatable_relocs* rr);
+#endif
+
+#ifdef HAVE_TARGET_32_BIG
+template
+Output_section*
+Layout::layout_reloc<32, true>(Sized_relobj<32, true>* object,
+                              unsigned int reloc_shndx,
+                              const elfcpp::Shdr<32, true>& shdr,
+                              Output_section* data_section,
+                              Relocatable_relocs* rr);
+#endif
+
+#ifdef HAVE_TARGET_64_LITTLE
+template
+Output_section*
+Layout::layout_reloc<64, false>(Sized_relobj<64, false>* object,
+                               unsigned int reloc_shndx,
+                               const elfcpp::Shdr<64, false>& shdr,
+                               Output_section* data_section,
+                               Relocatable_relocs* rr);
+#endif
+
+#ifdef HAVE_TARGET_64_BIG
+template
+Output_section*
+Layout::layout_reloc<64, true>(Sized_relobj<64, true>* object,
+                              unsigned int reloc_shndx,
+                              const elfcpp::Shdr<64, true>& shdr,
+                              Output_section* data_section,
+                              Relocatable_relocs* rr);
+#endif
+
+#ifdef HAVE_TARGET_32_LITTLE
+template
+void
+Layout::layout_group<32, false>(Symbol_table* symtab,
+                               Sized_relobj<32, false>* object,
+                               unsigned int,
+                               const char* group_section_name,
+                               const char* signature,
+                               const elfcpp::Shdr<32, false>& shdr,
+                               const elfcpp::Elf_Word* contents);
+#endif
+
+#ifdef HAVE_TARGET_32_BIG
+template
+void
+Layout::layout_group<32, true>(Symbol_table* symtab,
+                              Sized_relobj<32, true>* object,
+                              unsigned int,
+                              const char* group_section_name,
+                              const char* signature,
+                              const elfcpp::Shdr<32, true>& shdr,
+                              const elfcpp::Elf_Word* contents);
+#endif
+
+#ifdef HAVE_TARGET_64_LITTLE
+template
+void
+Layout::layout_group<64, false>(Symbol_table* symtab,
+                               Sized_relobj<64, false>* object,
+                               unsigned int,
+                               const char* group_section_name,
+                               const char* signature,
+                               const elfcpp::Shdr<64, false>& shdr,
+                               const elfcpp::Elf_Word* contents);
+#endif
+
+#ifdef HAVE_TARGET_64_BIG
+template
+void
+Layout::layout_group<64, true>(Symbol_table* symtab,
+                              Sized_relobj<64, true>* object,
+                              unsigned int,
+                              const char* group_section_name,
+                              const char* signature,
+                              const elfcpp::Shdr<64, true>& shdr,
+                              const elfcpp::Elf_Word* contents);
+#endif
+
+#ifdef HAVE_TARGET_32_LITTLE
+template
+Output_section*
 Layout::layout_eh_frame<32, false>(Sized_relobj<32, false>* object,
                                   const unsigned char* symbols,
                                   off_t symbols_size,