* layout.cc (Layout::relaxation_loop_body): Only clear load_seg if
[deliverable/binutils-gdb.git] / gold / layout.cc
index 5edba48aae57a8d987ca024e7195860424581713..2a8d3b49c01f1c182671c40fd7fe58344552f9f6 100644 (file)
@@ -1,6 +1,6 @@
 // layout.cc -- lay out output file sections for gold
 
-// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -46,6 +46,7 @@
 #include "ehframe.h"
 #include "compressed_output.h"
 #include "reduced_debug_output.h"
+#include "object.h"
 #include "reloc.h"
 #include "descriptors.h"
 #include "plugin.h"
 namespace gold
 {
 
+// Class Free_list.
+
+// The total number of free lists used.
+unsigned int Free_list::num_lists = 0;
+// The total number of free list nodes used.
+unsigned int Free_list::num_nodes = 0;
+// The total number of calls to Free_list::remove.
+unsigned int Free_list::num_removes = 0;
+// The total number of nodes visited during calls to Free_list::remove.
+unsigned int Free_list::num_remove_visits = 0;
+// The total number of calls to Free_list::allocate.
+unsigned int Free_list::num_allocates = 0;
+// The total number of nodes visited during calls to Free_list::allocate.
+unsigned int Free_list::num_allocate_visits = 0;
+
+// Initialize the free list.  Creates a single free list node that
+// describes the entire region of length LEN.  If EXTEND is true,
+// allocate() is allowed to extend the region beyond its initial
+// length.
+
+void
+Free_list::init(off_t len, bool extend)
+{
+  this->list_.push_front(Free_list_node(0, len));
+  this->last_remove_ = this->list_.begin();
+  this->extend_ = extend;
+  this->length_ = len;
+  ++Free_list::num_lists;
+  ++Free_list::num_nodes;
+}
+
+// Remove a chunk from the free list.  Because we start with a single
+// node that covers the entire section, and remove chunks from it one
+// at a time, we do not need to coalesce chunks or handle cases that
+// span more than one free node.  We expect to remove chunks from the
+// free list in order, and we expect to have only a few chunks of free
+// space left (corresponding to files that have changed since the last
+// incremental link), so a simple linear list should provide sufficient
+// performance.
+
+void
+Free_list::remove(off_t start, off_t end)
+{
+  if (start == end)
+    return;
+  gold_assert(start < end);
+
+  ++Free_list::num_removes;
+
+  Iterator p = this->last_remove_;
+  if (p->start_ > start)
+    p = this->list_.begin();
+
+  for (; p != this->list_.end(); ++p)
+    {
+      ++Free_list::num_remove_visits;
+      // Find a node that wholly contains the indicated region.
+      if (p->start_ <= start && p->end_ >= end)
+       {
+         // Case 1: the indicated region spans the whole node.
+         // Add some fuzz to avoid creating tiny free chunks.
+         if (p->start_ + 3 >= start && p->end_ <= end + 3)
+           p = this->list_.erase(p);
+         // Case 2: remove a chunk from the start of the node.
+         else if (p->start_ + 3 >= start)
+           p->start_ = end;
+         // Case 3: remove a chunk from the end of the node.
+         else if (p->end_ <= end + 3)
+           p->end_ = start;
+         // Case 4: remove a chunk from the middle, and split
+         // the node into two.
+         else
+           {
+             Free_list_node newnode(p->start_, start);
+             p->start_ = end;
+             this->list_.insert(p, newnode);
+             ++Free_list::num_nodes;
+           }
+         this->last_remove_ = p;
+         return;
+       }
+    }
+
+  // Did not find a node containing the given chunk.  This could happen
+  // because a small chunk was already removed due to the fuzz.
+  gold_debug(DEBUG_INCREMENTAL,
+            "Free_list::remove(%d,%d) not found",
+            static_cast<int>(start), static_cast<int>(end));
+}
+
+// Allocate a chunk of size LEN from the free list.  Returns -1ULL
+// if a sufficiently large chunk of free space is not found.
+// We use a simple first-fit algorithm.
+
+off_t
+Free_list::allocate(off_t len, uint64_t align, off_t minoff)
+{
+  gold_debug(DEBUG_INCREMENTAL,
+            "Free_list::allocate(%08lx, %d, %08lx)",
+            static_cast<long>(len), static_cast<int>(align),
+            static_cast<long>(minoff));
+  if (len == 0)
+    return align_address(minoff, align);
+
+  ++Free_list::num_allocates;
+
+  for (Iterator p = this->list_.begin(); p != this->list_.end(); ++p)
+    {
+      ++Free_list::num_allocate_visits;
+      off_t start = p->start_ > minoff ? p->start_ : minoff;
+      start = align_address(start, align);
+      off_t end = start + len;
+      if (end > p->end_ && p->end_ == this->length_ && this->extend_)
+       {
+         this->length_ = end;
+         p->end_ = end;
+       }
+      if (end <= p->end_)
+       {
+         if (p->start_ + 3 >= start && p->end_ <= end + 3)
+           this->list_.erase(p);
+         else if (p->start_ + 3 >= start)
+           p->start_ = end;
+         else if (p->end_ <= end + 3)
+           p->end_ = start;
+         else
+           {
+             Free_list_node newnode(p->start_, start);
+             p->start_ = end;
+             this->list_.insert(p, newnode);
+             ++Free_list::num_nodes;
+           }
+         return start;
+       }
+    }
+  if (this->extend_)
+    {
+      off_t start = align_address(this->length_, align);
+      this->length_ = start + len;
+      return start;
+    }
+  return -1;
+}
+
+// Dump the free list (for debugging).
+void
+Free_list::dump()
+{
+  gold_info("Free list:\n     start      end   length\n");
+  for (Iterator p = this->list_.begin(); p != this->list_.end(); ++p)
+    gold_info("  %08lx %08lx %08lx", static_cast<long>(p->start_),
+             static_cast<long>(p->end_),
+             static_cast<long>(p->end_ - p->start_));
+}
+
+// Print the statistics for the free lists.
+void
+Free_list::print_stats()
+{
+  fprintf(stderr, _("%s: total free lists: %u\n"),
+          program_name, Free_list::num_lists);
+  fprintf(stderr, _("%s: total free list nodes: %u\n"),
+          program_name, Free_list::num_nodes);
+  fprintf(stderr, _("%s: calls to Free_list::remove: %u\n"),
+          program_name, Free_list::num_removes);
+  fprintf(stderr, _("%s: nodes visited: %u\n"),
+          program_name, Free_list::num_remove_visits);
+  fprintf(stderr, _("%s: calls to Free_list::allocate: %u\n"),
+          program_name, Free_list::num_allocates);
+  fprintf(stderr, _("%s: nodes visited: %u\n"),
+          program_name, Free_list::num_allocate_visits);
+}
+
 // Layout::Relaxation_debug_check methods.
 
 // Check that sections and special data are in reset states.
@@ -136,10 +310,11 @@ Layout::Relaxation_debug_check::verify_sections(
 void
 Layout_task_runner::run(Workqueue* workqueue, const Task* task)
 {
-  off_t file_size = this->layout_->finalize(this->input_objects_,
-                                           this->symtab_,
-                                            this->target_,
-                                           task);
+  Layout* layout = this->layout_;
+  off_t file_size = layout->finalize(this->input_objects_,
+                                    this->symtab_,
+                                     this->target_,
+                                    task);
 
   // Now we know the final size of the output file and we know where
   // each piece of information goes.
@@ -147,17 +322,37 @@ Layout_task_runner::run(Workqueue* workqueue, const Task* task)
   if (this->mapfile_ != NULL)
     {
       this->mapfile_->print_discarded_sections(this->input_objects_);
-      this->layout_->print_to_mapfile(this->mapfile_);
+      layout->print_to_mapfile(this->mapfile_);
     }
 
-  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);
+  Output_file* of;
+  if (layout->incremental_base() == NULL)
+    {
+      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);
+    }
+  else
+    {
+      of = layout->incremental_base()->output_file();
+
+      // Apply the incremental relocations for symbols whose values
+      // have changed.  We do this before we resize the file and start
+      // writing anything else to it, so that we can read the old
+      // incremental information from the file before (possibly)
+      // overwriting it.
+      if (parameters->incremental_update())
+        layout->incremental_base()->apply_incremental_relocs(this->symtab_,
+                                                            this->layout_,
+                                                            of);
+
+      of->resize(file_size);
+    }
 
   // Queue up the final set of tasks.
   gold::queue_final_tasks(this->options_, this->input_objects_,
-                         this->symtab_, this->layout_, workqueue, of);
+                         this->symtab_, layout, workqueue, of);
 }
 
 // Layout methods.
@@ -177,6 +372,7 @@ Layout::Layout(int number_of_input_files, Script_options* script_options)
     section_headers_(NULL),
     tls_segment_(NULL),
     relro_segment_(NULL),
+    interp_segment_(NULL),
     increase_relro_(0),
     symtab_section_(NULL),
     symtab_xindex_(NULL),
@@ -203,11 +399,16 @@ Layout::Layout(int number_of_input_files, Script_options* script_options)
     any_postprocessing_sections_(false),
     resized_signatures_(false),
     have_stabstr_section_(false),
+    section_ordering_specified_(false),
     incremental_inputs_(NULL),
     record_output_section_data_from_script_(false),
     script_output_section_data_list_(),
     segment_states_(NULL),
-    relaxation_debug_check_(NULL)
+    relaxation_debug_check_(NULL),
+    input_section_position_(),
+    input_section_glob_(),
+    incremental_base_(NULL),
+    free_list_()
 {
   // 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.
@@ -218,7 +419,7 @@ Layout::Layout(int number_of_input_files, Script_options* script_options)
   this->special_output_list_.reserve(2);
 
   // Initialize structure needed for an incremental build.
-  if (parameters->options().incremental())
+  if (parameters->incremental())
     this->incremental_inputs_ = new Incremental_inputs;
 
   // The section name pool is worth optimizing in all cases, because
@@ -226,6 +427,15 @@ Layout::Layout(int number_of_input_files, Script_options* script_options)
   this->namepool_.set_optimize();
 }
 
+// For incremental links, record the base file to be modified.
+
+void
+Layout::set_incremental_base(Incremental_binary* base)
+{
+  this->incremental_base_ = base;
+  this->free_list_.init(base->output_file()->filesize(), true);
+}
+
 // Hash a key we use to look up an output section mapping.
 
 size_t
@@ -288,11 +498,35 @@ is_lines_only_debug_section(const char* str)
   return false;
 }
 
+// Sometimes we compress sections.  This is typically done for
+// sections that are not part of normal program execution (such as
+// .debug_* sections), and where the readers of these sections know
+// how to deal with compressed sections.  This routine doesn't say for
+// certain whether we'll compress -- it depends on commandline options
+// as well -- just whether this section is a candidate for compression.
+// (The Output_compressed_section class decides whether to compress
+// a given section, and picks the name of the compressed section.)
+
+static bool
+is_compressible_debug_section(const char* secname)
+{
+  return (is_prefix_of(".debug", secname));
+}
+
+// We may see compressed debug sections in input files.  Return TRUE
+// if this is the name of a compressed debug section.
+
+bool
+is_compressed_debug_section(const char* secname)
+{
+  return (is_prefix_of(".zdebug", secname));
+}
+
 // Whether to include this section in the link.
 
 template<int size, bool big_endian>
 bool
-Layout::include_section(Sized_relobj<size, big_endian>*, const char* name,
+Layout::include_section(Sized_relobj_file<size, big_endian>*, const char* name,
                        const elfcpp::Shdr<size, big_endian>& shdr)
 {
   if (shdr.get_sh_flags() & elfcpp::SHF_EXCLUDE)
@@ -398,19 +632,52 @@ Layout::find_output_segment(elfcpp::PT type, elfcpp::Elf_Word set,
   return NULL;
 }
 
+// When we put a .ctors or .dtors section with more than one word into
+// a .init_array or .fini_array section, we need to reverse the words
+// in the .ctors/.dtors section.  This is because .init_array executes
+// constructors front to back, where .ctors executes them back to
+// front, and vice-versa for .fini_array/.dtors.  Although we do want
+// to remap .ctors/.dtors into .init_array/.fini_array because it can
+// be more efficient, we don't want to change the order in which
+// constructors/destructors are run.  This set just keeps track of
+// these sections which need to be reversed.  It is only changed by
+// Layout::layout.  It should be a private member of Layout, but that
+// would require layout.h to #include object.h to get the definition
+// of Section_id.
+static Unordered_set<Section_id, Section_id_hash> ctors_sections_in_init_array;
+
+// Return whether OBJECT/SHNDX is a .ctors/.dtors section mapped to a
+// .init_array/.fini_array section.
+
+bool
+Layout::is_ctors_in_init_array(Relobj* relobj, unsigned int shndx) const
+{
+  return (ctors_sections_in_init_array.find(Section_id(relobj, shndx))
+         != ctors_sections_in_init_array.end());
+}
+
 // Return the output section to use for section NAME with type TYPE
 // and section flags FLAGS.  NAME must be canonicalized in the string
-// pool, and NAME_KEY is the key.  IS_INTERP is true if this is the
-// .interp section.  IS_DYNAMIC_LINKER_SECTION is true if this section
-// is used by the dynamic linker.  IS_RELRO is true for a relro
-// section.  IS_LAST_RELRO is true for the last relro section.
-// IS_FIRST_NON_RELRO is true for the first non-relro section.
+// pool, and NAME_KEY is the key.  ORDER is where this should appear
+// in the output sections.  IS_RELRO is true for a relro section.
 
 Output_section*
 Layout::get_output_section(const char* name, Stringpool::Key name_key,
                           elfcpp::Elf_Word type, elfcpp::Elf_Xword flags,
                           Output_section_order order, bool is_relro)
 {
+  elfcpp::Elf_Word lookup_type = type;
+
+  // For lookup purposes, treat INIT_ARRAY, FINI_ARRAY, and
+  // PREINIT_ARRAY like PROGBITS.  This ensures that we combine
+  // .init_array, .fini_array, and .preinit_array sections by name
+  // whatever their type in the input file.  We do this because the
+  // types are not always right in the input files.
+  if (lookup_type == elfcpp::SHT_INIT_ARRAY
+      || lookup_type == elfcpp::SHT_FINI_ARRAY
+      || lookup_type == elfcpp::SHT_PREINIT_ARRAY)
+    lookup_type = elfcpp::SHT_PROGBITS;
+
   elfcpp::Elf_Xword lookup_flags = flags;
 
   // Ignoring SHF_WRITE and SHF_EXECINSTR here means that we combine
@@ -419,7 +686,7 @@ Layout::get_output_section(const char* name, Stringpool::Key name_key,
   // controlling this.
   lookup_flags &= ~(elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR);
 
-  const Key key(name_key, std::make_pair(type, lookup_flags));
+  const Key key(name_key, std::make_pair(lookup_type, lookup_flags));
   const std::pair<Key, Output_section*> v(key, NULL);
   std::pair<Section_name_map::iterator, bool> ins(
     this->section_name_map_.insert(v));
@@ -436,20 +703,24 @@ Layout::get_output_section(const char* name, Stringpool::Key name_key,
       // there should be an option to control this.
       Output_section* os = NULL;
 
-      if (type == elfcpp::SHT_PROGBITS)
+      if (lookup_type == elfcpp::SHT_PROGBITS)
        {
           if (flags == 0)
             {
               Output_section* same_name = this->find_output_section(name);
               if (same_name != NULL
-                  && same_name->type() == elfcpp::SHT_PROGBITS
+                  && (same_name->type() == elfcpp::SHT_PROGBITS
+                     || same_name->type() == elfcpp::SHT_INIT_ARRAY
+                     || same_name->type() == elfcpp::SHT_FINI_ARRAY
+                     || same_name->type() == elfcpp::SHT_PREINIT_ARRAY)
                   && (same_name->flags() & elfcpp::SHF_TLS) == 0)
                 os = same_name;
             }
           else if ((flags & elfcpp::SHF_TLS) == 0)
             {
               elfcpp::Elf_Xword zero_flags = 0;
-              const Key zero_key(name_key, std::make_pair(type, zero_flags));
+              const Key zero_key(name_key, std::make_pair(lookup_type,
+                                                         zero_flags));
               Section_name_map::iterator p =
                   this->section_name_map_.find(zero_key);
               if (p != this->section_name_map_.end())
@@ -469,12 +740,9 @@ Layout::get_output_section(const char* name, Stringpool::Key name_key,
 // RELOBJ, with type TYPE and flags FLAGS.  RELOBJ may be NULL for a
 // linker created section.  IS_INPUT_SECTION is true if we are
 // choosing an output section for an input section found in a input
-// file.  IS_INTERP is true if this is the .interp section.
-// IS_DYNAMIC_LINKER_SECTION is true if this section is used by the
-// dynamic linker.  IS_RELRO is true for a relro section.
-// IS_LAST_RELRO is true for the last relro section.
-// IS_FIRST_NON_RELRO is true for the first non-relro section.  This
-// will return NULL if the input section should be discarded.
+// file.  ORDER is where this section should appear in the output
+// sections.  IS_RELRO is true for a relro section.  This will return
+// NULL if the input section should be discarded.
 
 Output_section*
 Layout::choose_output_section(const Relobj* relobj, const char* name,
@@ -489,11 +757,15 @@ Layout::choose_output_section(const Relobj* relobj, const char* name,
   // Some flags in the input section should not be automatically
   // copied to the output section.
   flags &= ~ (elfcpp::SHF_INFO_LINK
-             | elfcpp::SHF_LINK_ORDER
              | elfcpp::SHF_GROUP
              | elfcpp::SHF_MERGE
              | elfcpp::SHF_STRINGS);
 
+  // We only clear the SHF_LINK_ORDER flag in for
+  // a non-relocatable link.
+  if (!parameters->options().relocatable())
+    flags &= ~elfcpp::SHF_LINK_ORDER;
+
   if (this->script_options_->saw_sections_clause())
     {
       // We are using a SECTIONS clause, so the output section is
@@ -503,10 +775,15 @@ Layout::choose_output_section(const Relobj* relobj, const char* name,
       const char* file_name = relobj == NULL ? NULL : relobj->name().c_str();
       Output_section** output_section_slot;
       Script_sections::Section_type script_section_type;
+      const char* orig_name = name;
       name = ss->output_section_name(file_name, name, &output_section_slot,
                                     &script_section_type);
       if (name == NULL)
        {
+         gold_debug(DEBUG_SCRIPT, _("Unable to create output section '%s' "
+                                    "because it is not allowed by the "
+                                    "SECTIONS clause of the linker script"),
+                    orig_name);
          // The SECTIONS clause says to discard this input section.
          return NULL;
        }
@@ -572,23 +849,75 @@ Layout::choose_output_section(const Relobj* relobj, const char* name,
 
   // FIXME: Handle SHF_OS_NONCONFORMING somewhere.
 
+  size_t len = strlen(name);
+  char* uncompressed_name = NULL;
+
+  // Compressed debug sections should be mapped to the corresponding
+  // uncompressed section.
+  if (is_compressed_debug_section(name))
+    {
+      uncompressed_name = new char[len];
+      uncompressed_name[0] = '.';
+      gold_assert(name[0] == '.' && name[1] == 'z');
+      strncpy(&uncompressed_name[1], &name[2], len - 2);
+      uncompressed_name[len - 1] = '\0';
+      len -= 1;
+      name = uncompressed_name;
+    }
+
   // Turn NAME from the name of the input section into the name of the
   // output section.
-
-  size_t len = strlen(name);
   if (is_input_section
       && !this->script_options_->saw_sections_clause()
       && !parameters->options().relocatable())
-    name = Layout::output_section_name(name, &len);
+    name = Layout::output_section_name(relobj, name, &len);
 
   Stringpool::Key name_key;
   name = this->namepool_.add_with_length(name, len, true, &name_key);
 
+  if (uncompressed_name != NULL)
+    delete[] uncompressed_name;
+
   // 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, order, is_relro);
 }
 
+// For incremental links, record the initial fixed layout of a section
+// from the base file, and return a pointer to the Output_section.
+
+template<int size, bool big_endian>
+Output_section*
+Layout::init_fixed_output_section(const char* name,
+                                 elfcpp::Shdr<size, big_endian>& shdr)
+{
+  unsigned int sh_type = shdr.get_sh_type();
+
+  // We preserve the layout of PROGBITS, NOBITS, and NOTE sections.
+  // All others will be created from scratch and reallocated.
+  if (sh_type != elfcpp::SHT_PROGBITS
+      && sh_type != elfcpp::SHT_NOBITS
+      && sh_type != elfcpp::SHT_NOTE)
+    return NULL;
+
+  typename elfcpp::Elf_types<size>::Elf_Addr sh_addr = shdr.get_sh_addr();
+  typename elfcpp::Elf_types<size>::Elf_Off sh_offset = shdr.get_sh_offset();
+  typename elfcpp::Elf_types<size>::Elf_WXword sh_size = shdr.get_sh_size();
+  typename elfcpp::Elf_types<size>::Elf_WXword sh_flags = shdr.get_sh_flags();
+  typename elfcpp::Elf_types<size>::Elf_WXword sh_addralign =
+      shdr.get_sh_addralign();
+
+  // Make the output section.
+  Stringpool::Key name_key;
+  name = this->namepool_.add(name, true, &name_key);
+  Output_section* os = this->get_output_section(name, name_key, sh_type,
+                                               sh_flags, ORDER_INVALID, false);
+  os->set_fixed_layout(sh_addr, sh_offset, sh_size, sh_addralign);
+  if (sh_type != elfcpp::SHT_NOBITS)
+    this->free_list_.remove(sh_offset, sh_offset + sh_size);
+  return os;
+}
+
 // 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
@@ -601,7 +930,7 @@ Layout::choose_output_section(const Relobj* relobj, const char* name,
 
 template<int size, bool big_endian>
 Output_section*
-Layout::layout(Sized_relobj<size, big_endian>* object, unsigned int shndx,
+Layout::layout(Sized_relobj_file<size, big_endian>* object, unsigned int shndx,
               const char* name, const elfcpp::Shdr<size, big_endian>& shdr,
               unsigned int reloc_shndx, unsigned int, off_t* off)
 {
@@ -610,32 +939,11 @@ Layout::layout(Sized_relobj<size, big_endian>* object, unsigned int shndx,
   if (!this->include_section(object, name, shdr))
     return NULL;
 
-  Output_section* os;
-
-  // Sometimes .init_array*, .preinit_array* and .fini_array* do not have
-  // correct section types.  Force them here.
   elfcpp::Elf_Word sh_type = shdr.get_sh_type();
-  if (sh_type == elfcpp::SHT_PROGBITS)
-    {
-      static const char init_array_prefix[] = ".init_array";
-      static const char preinit_array_prefix[] = ".preinit_array";
-      static const char fini_array_prefix[] = ".fini_array";
-      static size_t init_array_prefix_size = sizeof(init_array_prefix) - 1;
-      static size_t preinit_array_prefix_size =
-       sizeof(preinit_array_prefix) - 1;
-      static size_t fini_array_prefix_size = sizeof(fini_array_prefix) - 1;
-
-      if (strncmp(name, init_array_prefix, init_array_prefix_size) == 0)
-       sh_type = elfcpp::SHT_INIT_ARRAY;
-      else if (strncmp(name, preinit_array_prefix, preinit_array_prefix_size)
-              == 0)
-       sh_type = elfcpp::SHT_PREINIT_ARRAY;
-      else if (strncmp(name, fini_array_prefix, fini_array_prefix_size) == 0)
-       sh_type = elfcpp::SHT_FINI_ARRAY;
-    }
 
   // In a relocatable link a grouped section must not be combined with
   // any other sections.
+  Output_section* os;
   if (parameters->options().relocatable()
       && (shdr.get_sh_flags() & elfcpp::SHF_GROUP) != 0)
     {
@@ -653,20 +961,55 @@ Layout::layout(Sized_relobj<size, big_endian>* object, unsigned int shndx,
     }
 
   // By default the GNU linker sorts input sections whose names match
-  // .ctor.*, .dtor.*, .init_array.*, or .fini_array.*.  The sections
-  // are sorted by name.  This is used to implement constructor
-  // priority ordering.  We are compatible.
+  // .ctors.*, .dtors.*, .init_array.*, or .fini_array.*.  The
+  // sections are sorted by name.  This is used to implement
+  // constructor priority ordering.  We are compatible.  When we put
+  // .ctor sections in .init_array and .dtor sections in .fini_array,
+  // we must also sort plain .ctor and .dtor sections.
   if (!this->script_options_->saw_sections_clause()
+      && !parameters->options().relocatable()
       && (is_prefix_of(".ctors.", name)
          || is_prefix_of(".dtors.", name)
          || is_prefix_of(".init_array.", name)
-         || is_prefix_of(".fini_array.", name)))
+         || is_prefix_of(".fini_array.", name)
+         || (parameters->options().ctors_in_init_array()
+             && (strcmp(name, ".ctors") == 0
+                 || strcmp(name, ".dtors") == 0))))
     os->set_must_sort_attached_input_sections();
 
+  // If this is a .ctors or .ctors.* section being mapped to a
+  // .init_array section, or a .dtors or .dtors.* section being mapped
+  // to a .fini_array section, we will need to reverse the words if
+  // there is more than one.  Record this section for later.  See
+  // ctors_sections_in_init_array above.
+  if (!this->script_options_->saw_sections_clause()
+      && !parameters->options().relocatable()
+      && shdr.get_sh_size() > size / 8
+      && (((strcmp(name, ".ctors") == 0
+           || is_prefix_of(".ctors.", name))
+          && strcmp(os->name(), ".init_array") == 0)
+         || ((strcmp(name, ".dtors") == 0
+              || is_prefix_of(".dtors.", name))
+             && strcmp(os->name(), ".fini_array") == 0)))
+    ctors_sections_in_init_array.insert(Section_id(object, shndx));
+
   // FIXME: Handle SHF_LINK_ORDER somewhere.
 
+  elfcpp::Elf_Xword orig_flags = os->flags();
+
   *off = os->add_input_section(this, object, shndx, name, shdr, reloc_shndx,
                               this->script_options_->saw_sections_clause());
+
+  // If the flags changed, we may have to change the order.
+  if ((orig_flags & elfcpp::SHF_ALLOC) != 0)
+    {
+      orig_flags &= (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR);
+      elfcpp::Elf_Xword new_flags =
+       os->flags() & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR);
+      if (orig_flags != new_flags)
+       os->set_order(this->default_section_order(os, false));
+    }
+
   this->have_added_input_section_ = true;
 
   return os;
@@ -676,7 +1019,7 @@ Layout::layout(Sized_relobj<size, big_endian>* object, unsigned int shndx,
 
 template<int size, bool big_endian>
 Output_section*
-Layout::layout_reloc(Sized_relobj<size, big_endian>* object,
+Layout::layout_reloc(Sized_relobj_file<size, big_endian>* object,
                     unsigned int,
                     const elfcpp::Shdr<size, big_endian>& shdr,
                     Output_section* data_section,
@@ -743,7 +1086,7 @@ Layout::layout_reloc(Sized_relobj<size, big_endian>* object,
 template<int size, bool big_endian>
 void
 Layout::layout_group(Symbol_table* symtab,
-                    Sized_relobj<size, big_endian>* object,
+                    Sized_relobj_file<size, big_endian>* object,
                     unsigned int,
                     const char* group_section_name,
                     const char* signature,
@@ -793,7 +1136,7 @@ Layout::layout_group(Symbol_table* symtab,
 
 template<int size, bool big_endian>
 Output_section*
-Layout::layout_eh_frame(Sized_relobj<size, big_endian>* object,
+Layout::layout_eh_frame(Sized_relobj_file<size, big_endian>* object,
                        const unsigned char* symbols,
                        off_t symbols_size,
                        const unsigned char* symbol_names,
@@ -803,11 +1146,77 @@ Layout::layout_eh_frame(Sized_relobj<size, big_endian>* object,
                        unsigned int reloc_shndx, unsigned int reloc_type,
                        off_t* off)
 {
-  gold_assert(shdr.get_sh_type() == elfcpp::SHT_PROGBITS);
+  gold_assert(shdr.get_sh_type() == elfcpp::SHT_PROGBITS
+             || shdr.get_sh_type() == elfcpp::SHT_X86_64_UNWIND);
   gold_assert((shdr.get_sh_flags() & elfcpp::SHF_ALLOC) != 0);
 
-  const char* const name = ".eh_frame";
-  Output_section* os = this->choose_output_section(object, name,
+  Output_section* os = this->make_eh_frame_section(object);
+  if (os == NULL)
+    return NULL;
+
+  gold_assert(this->eh_frame_section_ == os);
+
+  elfcpp::Elf_Xword orig_flags = os->flags();
+
+  if (!parameters->incremental()
+      && this->eh_frame_data_->add_ehframe_input_section(object,
+                                                        symbols,
+                                                        symbols_size,
+                                                        symbol_names,
+                                                        symbol_names_size,
+                                                        shndx,
+                                                        reloc_shndx,
+                                                        reloc_type))
+    {
+      os->update_flags_for_input_section(shdr.get_sh_flags());
+
+      // A writable .eh_frame section is a RELRO section.
+      if ((orig_flags & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR))
+         != (os->flags() & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR)))
+       {
+         os->set_is_relro();
+         os->set_order(ORDER_RELRO);
+       }
+
+      // We found a .eh_frame section we are going to optimize, so now
+      // we can add the set of optimized sections to the output
+      // section.  We need to postpone adding this until we've found a
+      // section we can optimize so that the .eh_frame section in
+      // crtbegin.o winds up at the start of the output section.
+      if (!this->added_eh_frame_data_)
+       {
+         os->add_output_section_data(this->eh_frame_data_);
+         this->added_eh_frame_data_ = true;
+       }
+      *off = -1;
+    }
+  else
+    {
+      // We couldn't handle this .eh_frame section for some reason.
+      // Add it as a normal section.
+      bool saw_sections_clause = this->script_options_->saw_sections_clause();
+      *off = os->add_input_section(this, object, shndx, ".eh_frame", shdr,
+                                  reloc_shndx, saw_sections_clause);
+      this->have_added_input_section_ = true;
+
+      if ((orig_flags & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR))
+         != (os->flags() & (elfcpp::SHF_WRITE | elfcpp::SHF_EXECINSTR)))
+       os->set_order(this->default_section_order(os, false));
+    }
+
+  return os;
+}
+
+// Create and return the magic .eh_frame section.  Create
+// .eh_frame_hdr also if appropriate.  OBJECT is the object with the
+// input .eh_frame section; it may be NULL.
+
+Output_section*
+Layout::make_eh_frame_section(const Relobj* object)
+{
+  // FIXME: On x86_64, this could use SHT_X86_64_UNWIND rather than
+  // SHT_PROGBITS.
+  Output_section* os = this->choose_output_section(object, ".eh_frame",
                                                   elfcpp::SHT_PROGBITS,
                                                   elfcpp::SHF_ALLOC, false,
                                                   ORDER_EHFRAME, false);
@@ -819,7 +1228,9 @@ Layout::layout_eh_frame(Sized_relobj<size, big_endian>* object,
       this->eh_frame_section_ = os;
       this->eh_frame_data_ = new Eh_frame();
 
-      if (parameters->options().eh_frame_hdr())
+      // For incremental linking, we do not optimize .eh_frame sections
+      // or create a .eh_frame_hdr section.
+      if (parameters->options().eh_frame_hdr() && !parameters->incremental())
        {
          Output_section* hdr_os =
            this->choose_output_section(NULL, ".eh_frame_hdr",
@@ -849,42 +1260,31 @@ Layout::layout_eh_frame(Sized_relobj<size, big_endian>* object,
        }
     }
 
-  gold_assert(this->eh_frame_section_ == os);
+  return os;
+}
 
-  if (this->eh_frame_data_->add_ehframe_input_section(object,
-                                                     symbols,
-                                                     symbols_size,
-                                                     symbol_names,
-                                                     symbol_names_size,
-                                                     shndx,
-                                                     reloc_shndx,
-                                                     reloc_type))
-    {
-      os->update_flags_for_input_section(shdr.get_sh_flags());
+// Add an exception frame for a PLT.  This is called from target code.
 
-      // We found a .eh_frame section we are going to optimize, so now
-      // we can add the set of optimized sections to the output
-      // section.  We need to postpone adding this until we've found a
-      // section we can optimize so that the .eh_frame section in
-      // crtbegin.o winds up at the start of the output section.
-      if (!this->added_eh_frame_data_)
-       {
-         os->add_output_section_data(this->eh_frame_data_);
-         this->added_eh_frame_data_ = true;
-       }
-      *off = -1;
+void
+Layout::add_eh_frame_for_plt(Output_data* plt, const unsigned char* cie_data,
+                            size_t cie_length, const unsigned char* fde_data,
+                            size_t fde_length)
+{
+  if (parameters->incremental())
+    {
+      // FIXME: Maybe this could work some day....
+      return;
     }
-  else
+  Output_section* os = this->make_eh_frame_section(NULL);
+  if (os == NULL)
+    return;
+  this->eh_frame_data_->add_ehframe_for_plt(plt, cie_data, cie_length,
+                                           fde_data, fde_length);
+  if (!this->added_eh_frame_data_)
     {
-      // We couldn't handle this .eh_frame section for some reason.
-      // Add it as a normal section.
-      bool saw_sections_clause = this->script_options_->saw_sections_clause();
-      *off = os->add_input_section(this, object, shndx, name, shdr, reloc_shndx,
-                                  saw_sections_clause);
-      this->have_added_input_section_ = true;
+      os->add_output_section_data(this->eh_frame_data_);
+      this->added_eh_frame_data_ = true;
     }
-
-  return os;
 }
 
 // Add POSD to an output section using NAME, TYPE, and FLAGS.  Return
@@ -916,30 +1316,6 @@ Layout::section_flags_to_segment(elfcpp::Elf_Xword flags)
   return ret;
 }
 
-// Sometimes we compress sections.  This is typically done for
-// sections that are not part of normal program execution (such as
-// .debug_* sections), and where the readers of these sections know
-// how to deal with compressed sections.  This routine doesn't say for
-// certain whether we'll compress -- it depends on commandline options
-// as well -- just whether this section is a candidate for compression.
-// (The Output_compressed_section class decides whether to compress
-// a given section, and picks the name of the compressed section.)
-
-static bool
-is_compressible_debug_section(const char* secname)
-{
-  return (is_prefix_of(".debug", secname));
-}
-
-// We may see compressed debug sections in input files.  Return TRUE
-// if this is the name of a compressed debug section.
-
-bool
-is_compressed_debug_section(const char* secname)
-{
-  return (is_prefix_of(".zdebug", secname));
-}
-
 // Make a new Output_section, and attach it to segments as
 // appropriate.  ORDER is the order in which this section should
 // appear in the output segment.  IS_RELRO is true if this is a relro
@@ -976,6 +1352,18 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
     }
   else
     {
+      // Sometimes .init_array*, .preinit_array* and .fini_array* do
+      // not have correct section types.  Force them here.
+      if (type == elfcpp::SHT_PROGBITS)
+       {
+         if (is_prefix_of(".init_array", name))
+           type = elfcpp::SHT_INIT_ARRAY;
+         else if (is_prefix_of(".preinit_array", name))
+           type = elfcpp::SHT_PREINIT_ARRAY;
+         else if (is_prefix_of(".fini_array", name))
+           type = elfcpp::SHT_FINI_ARRAY;
+       }
+
       // FIXME: const_cast is ugly.
       Target* target = const_cast<Target*>(&parameters->target());
       os = target->make_output_section(name, type, flags);
@@ -1023,10 +1411,12 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
   // do the same.  We need to know that this might happen before we
   // attach any input sections.
   if (!this->script_options_->saw_sections_clause()
-      && (strcmp(name, ".ctors") == 0
-         || strcmp(name, ".dtors") == 0
-         || strcmp(name, ".init_array") == 0
-         || strcmp(name, ".fini_array") == 0))
+      && !parameters->options().relocatable()
+      && (strcmp(name, ".init_array") == 0
+         || strcmp(name, ".fini_array") == 0
+         || (!parameters->options().ctors_in_init_array()
+             && (strcmp(name, ".ctors") == 0
+                 || strcmp(name, ".dtors") == 0))))
     os->set_may_sort_attached_input_sections();
 
   // Check for .stab*str sections, as .stab* sections need to link to
@@ -1037,6 +1427,21 @@ Layout::make_output_section(const char* name, elfcpp::Elf_Word type,
       && strcmp(name + strlen(name) - 3, "str") == 0)
     this->have_stabstr_section_ = true;
 
+  // During a full incremental link, we add patch space to most
+  // PROGBITS and NOBITS sections.  Flag those that may be
+  // arbitrarily padded.
+  if ((type == elfcpp::SHT_PROGBITS || type == elfcpp::SHT_NOBITS)
+      && order != ORDER_INTERP
+      && order != ORDER_INIT
+      && order != ORDER_PLT
+      && order != ORDER_FINI
+      && order != ORDER_RELRO_LAST
+      && order != ORDER_NON_RELRO_FIRST
+      && strcmp(name, ".ctors") != 0
+      && strcmp(name, ".dtors") != 0
+      && strcmp(name, ".jcr") != 0)
+    os->set_is_patch_space_allowed();
+
   // If we have already attached the sections to segments, then we
   // need to attach this one now.  This happens for sections created
   // directly by the linker.
@@ -1166,10 +1571,11 @@ Layout::attach_allocated_section_to_segment(Output_section* os)
   bool is_address_set = parameters->options().section_start(os->name(), &addr);
 
   // 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.  Large data sections also go into their own
-  // PT_LOAD segment.  People who need segments sorted on some other
-  // basis will have to use a linker script.
+  // segments is whether or not they are writable or executable,
+  // so that is how we search for them.
+  // Large data sections also go into their own PT_LOAD segment.
+  // 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();
@@ -1181,6 +1587,9 @@ Layout::attach_allocated_section_to_segment(Output_section* os)
       if (!parameters->options().omagic()
          && ((*p)->flags() & elfcpp::PF_W) != (seg_flags & elfcpp::PF_W))
        continue;
+      if (parameters->options().rosegment()
+          && ((*p)->flags() & elfcpp::PF_X) != (seg_flags & elfcpp::PF_X))
+        continue;
       // If -Tbss was specified, we need to separate the data and BSS
       // segments.
       if (parameters->options().user_set_Tbss())
@@ -1262,6 +1671,20 @@ Layout::attach_allocated_section_to_segment(Output_section* os)
        this->make_output_segment(elfcpp::PT_GNU_RELRO, seg_flags);
       this->relro_segment_->add_output_section_to_nonload(os, seg_flags);
     }
+
+  // If we see a section named .interp, put it into a PT_INTERP
+  // segment.  This seems broken to me, but this is what GNU ld does,
+  // and glibc expects it.
+  if (strcmp(os->name(), ".interp") == 0
+      && !this->script_options_->saw_phdrs_clause())
+    {
+      if (this->interp_segment_ == NULL)
+       this->make_output_segment(elfcpp::PT_INTERP, seg_flags);
+      else
+       gold_warning(_("multiple '.interp' sections in input files "
+                      "may cause confusing PT_INTERP segment"));
+      this->interp_segment_->add_output_section_to_nonload(os, seg_flags);
+    }
 }
 
 // Make an output section for a script.
@@ -1314,15 +1737,29 @@ Layout::expected_segment_count() const
 // object.  On some targets that will force an executable stack.
 
 void
-Layout::layout_gnu_stack(bool seen_gnu_stack, uint64_t gnu_stack_flags)
+Layout::layout_gnu_stack(bool seen_gnu_stack, uint64_t gnu_stack_flags,
+                        const Object* obj)
 {
   if (!seen_gnu_stack)
-    this->input_without_gnu_stack_note_ = true;
+    {
+      this->input_without_gnu_stack_note_ = true;
+      if (parameters->options().warn_execstack()
+         && parameters->target().is_default_stack_executable())
+       gold_warning(_("%s: missing .note.GNU-stack section"
+                      " implies executable stack"),
+                    obj->name().c_str());
+    }
   else
     {
       this->input_with_gnu_stack_note_ = true;
       if ((gnu_stack_flags & elfcpp::SHF_EXECINSTR) != 0)
-       this->input_requires_executable_stack_ = true;
+       {
+         this->input_requires_executable_stack_ = true;
+         if (parameters->options().warn_execstack()
+             || parameters->options().is_stack_executable())
+           gold_warning(_("%s: requires executable stack"),
+                        obj->name().c_str());
+       }
     }
 }
 
@@ -1352,15 +1789,20 @@ Layout::create_initial_dynamic_sections(Symbol_table* symtab)
                                                       false, ORDER_RELRO,
                                                       true);
 
-  this->dynamic_symbol_ =
-    symtab->define_in_output_data("_DYNAMIC", NULL, Symbol_table::PREDEFINED,
-                                 this->dynamic_section_, 0, 0,
-                                 elfcpp::STT_OBJECT, elfcpp::STB_LOCAL,
-                                 elfcpp::STV_HIDDEN, 0, false, false);
+  // A linker script may discard .dynamic, so check for NULL.
+  if (this->dynamic_section_ != NULL)
+    {
+      this->dynamic_symbol_ =
+       symtab->define_in_output_data("_DYNAMIC", NULL,
+                                     Symbol_table::PREDEFINED,
+                                     this->dynamic_section_, 0, 0,
+                                     elfcpp::STT_OBJECT, elfcpp::STB_LOCAL,
+                                     elfcpp::STV_HIDDEN, 0, false, false);
 
-  this->dynamic_data_ =  new Output_data_dynamic(&this->dynpool_);
+      this->dynamic_data_ =  new Output_data_dynamic(&this->dynpool_);
 
-  this->dynamic_section_->add_output_section_data(this->dynamic_data_);
+      this->dynamic_section_->add_output_section_data(this->dynamic_data_);
+    }
 }
 
 // For each output section whose name can be represented as C symbol,
@@ -1449,6 +1891,7 @@ Layout::define_group_signatures(Symbol_table* symtab)
 Output_segment*
 Layout::find_first_load_seg()
 {
+  Output_segment* best = NULL;
   for (Segment_list::const_iterator p = this->segment_list_.begin();
        p != this->segment_list_.end();
        ++p)
@@ -1457,8 +1900,13 @@ Layout::find_first_load_seg()
          && ((*p)->flags() & elfcpp::PF_R) != 0
          && (parameters->options().omagic()
              || ((*p)->flags() & elfcpp::PF_W) == 0))
-       return *p;
+        {
+          if (best == NULL || this->segment_precedes(*p, best))
+            best = *p;
+        }
     }
+  if (best != NULL)
+    return best;
 
   gold_assert(!this->script_options_->saw_phdrs_clause());
 
@@ -1647,8 +2095,12 @@ Layout::relaxation_loop_body(
   // If the user set the address of the text segment, that may not be
   // compatible with putting the segment headers and file headers into
   // that segment.
-  if (parameters->options().user_set_Ttext())
-    load_seg = NULL;
+  if (parameters->options().user_set_Ttext()
+      && parameters->options().Ttext() % target->common_pagesize() != 0)
+    {
+      load_seg = NULL;
+      phdr_seg = NULL;
+    }
 
   gold_assert(phdr_seg == NULL
              || load_seg != NULL
@@ -1764,7 +2216,7 @@ Layout::find_section_order_index(const std::string& section_name)
 }
 
 // Read the sequence of input sections from the file specified with
-// --section-ordering-file.
+// option --section-ordering-file.
 
 void
 Layout::read_layout_from_file()
@@ -1780,6 +2232,7 @@ Layout::read_layout_from_file()
 
   std::getline(in, line);   // this chops off the trailing \n, if any
   unsigned int position = 1;
+  this->set_section_ordering_specified();
 
   while (in)
     {
@@ -1864,8 +2317,11 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab,
                                  &versions);
 
       // Create the .interp section to hold the name of the
-      // interpreter, and put it in a PT_INTERP segment.
-      if (!parameters->options().shared())
+      // interpreter, and put it in a PT_INTERP segment.  Don't do it
+      // if we saw a .interp section in an input file.
+      if ((!parameters->options().shared()
+          || parameters->options().dynamic_linker() != NULL)
+         && this->interp_segment_ == NULL)
         this->create_interp(target);
 
       // Finish the .dynamic section to hold the dynamic data, and put
@@ -1893,9 +2349,8 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab,
      : new Output_segment_headers(this->segment_list_));
 
   // Lay out the file header.
-  Output_file_header* file_header
-    = new Output_file_header(target, symtab, segment_headers,
-                            parameters->options().entry());
+  Output_file_header* file_header = new Output_file_header(target, symtab,
+                                                          segment_headers);
 
   this->special_output_list_.push_back(file_header);
   if (segment_headers != NULL)
@@ -1924,7 +2379,7 @@ Layout::finalize(const Input_objects* input_objects, Symbol_table* symtab,
       pass++;
     }
   while (target->may_relax()
-        && target->relax(pass, input_objects, symtab, this));
+        && target->relax(pass, input_objects, symtab, this, task));
 
   // 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
@@ -2093,7 +2548,8 @@ Layout::create_note(const char* name, int note_type,
 void
 Layout::create_gold_note()
 {
-  if (parameters->options().relocatable())
+  if (parameters->options().relocatable()
+      || parameters->incremental_update())
     return;
 
   std::string desc = std::string("gold ") + gold::get_version_string();
@@ -2374,7 +2830,7 @@ Layout::create_incremental_info_sections(Symbol_table* symtab)
 
 // Return whether SEG1 should be before SEG2 in the output file.  This
 // is based entirely on the segment type and flags.  When this is
-// called the segment addresses has normally not yet been set.
+// called the segment addresses have normally not yet been set.
 
 bool
 Layout::segment_precedes(const Output_segment* seg1,
@@ -2500,8 +2956,10 @@ Layout::segment_precedes(const Output_segment* seg1,
     return (flags1 & elfcpp::PF_R) == 0;
 
   // We shouldn't get here--we shouldn't create segments which we
-  // can't distinguish.
-  gold_unreachable();
+  // can't distinguish.  Unless of course we are using a weird linker
+  // script.
+  gold_assert(this->script_options_->saw_phdrs_clause());
+  return false;
 }
 
 // Increase OFF so that it is congruent to ADDR modulo ABI_PAGESIZE.
@@ -2525,9 +2983,11 @@ off_t
 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(),
-           Layout::Compare_segments());
+  // Sort them into the final order.  We use a stable sort so that we
+  // don't randomize the order of indistinguishable segments created
+  // by linker scripts.
+  std::stable_sort(this->segment_list_.begin(), this->segment_list_.end(),
+                  Layout::Compare_segments(this));
 
   // Find the PT_LOAD segments, and set their addresses and offsets
   // and their section's addresses and offsets.
@@ -2562,7 +3022,6 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
   const bool check_sections = parameters->options().check_sections();
   Output_segment* last_load_segment = NULL;
 
-  bool was_readonly = false;
   for (Segment_list::iterator p = this->segment_list_.begin();
        p != this->segment_list_.end();
        ++p)
@@ -2609,21 +3068,17 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
 
          if (!are_addresses_set)
            {
-             // 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.
+             // 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. We will revisit this
+             // decision once we know the size of the segment.
 
              addr = align_address(addr, (*p)->maximum_alignment());
              aligned_addr = addr;
 
-             if (was_readonly && ((*p)->flags() & elfcpp::PF_W) != 0)
-               {
-                 if ((addr & (abi_pagesize - 1)) != 0)
-                   addr = addr + abi_pagesize;
-               }
+             if ((addr & (abi_pagesize - 1)) != 0)
+                addr = addr + abi_pagesize;
 
              off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1));
            }
@@ -2646,17 +3101,24 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
            }
 
          unsigned int shndx_hold = *pshndx;
+         bool has_relro = false;
          uint64_t new_addr = (*p)->set_section_addresses(this, false, addr,
-                                                         increase_relro,
+                                                         &increase_relro,
+                                                         &has_relro,
                                                           &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
          // file space, by instead aligning to the start of a new
          // page.  Here we use the real machine page size rather than
-         // the ABI mandated page size.
-
-         if (!are_addresses_set && aligned_addr != addr)
+         // the ABI mandated page size.  If the segment has been
+         // aligned so that the relro data ends at a page boundary,
+         // we do not try to realign it.
+
+         if (!are_addresses_set
+             && !has_relro
+             && aligned_addr != addr
+             && !parameters->incremental())
            {
              uint64_t first_off = (common_pagesize
                                    - (aligned_addr
@@ -2673,17 +3135,21 @@ Layout::set_segment_offsets(const Target* target, Output_segment* load_seg,
                  addr = align_address(addr, (*p)->maximum_alignment());
                  off = orig_off + ((addr - orig_addr) & (abi_pagesize - 1));
                  off = align_file_offset(off, addr, abi_pagesize);
+
+                 increase_relro = this->increase_relro_;
+                 if (this->script_options_->saw_sections_clause())
+                   increase_relro = 0;
+                 has_relro = false;
+
                  new_addr = (*p)->set_section_addresses(this, true, addr,
-                                                        increase_relro,
+                                                        &increase_relro,
+                                                        &has_relro,
                                                          &off, pshndx);
                }
            }
 
          addr = new_addr;
 
-         if (((*p)->flags() & elfcpp::PF_W) == 0)
-           was_readonly = true;
-
          // Implement --check-sections.  We know that the segments
          // are sorted by LMA.
          if (check_sections && last_load_segment != NULL)
@@ -2769,6 +3235,9 @@ Layout::set_relocatable_section_offsets(Output_data* file_header,
 off_t
 Layout::set_section_offsets(off_t off, Layout::Section_offset_pass pass)
 {
+  off_t startoff = off;
+  off_t maxoff = off;
+
   for (Section_list::iterator p = this->unattached_section_list_.begin();
        p != this->unattached_section_list_.end();
        ++p)
@@ -2800,16 +3269,53 @@ Layout::set_section_offsets(off_t off, Layout::Section_offset_pass pass)
                    || (*p)->type() != elfcpp::SHT_STRTAB))
         continue;
 
-      off = align_address(off, (*p)->addralign());
-      (*p)->set_file_offset(off);
-      (*p)->finalize_data_size();
+      if (!parameters->incremental_update())
+       {
+         off = align_address(off, (*p)->addralign());
+         (*p)->set_file_offset(off);
+         (*p)->finalize_data_size();
+       }
+      else
+       {
+         // Incremental update: allocate file space from free list.
+         (*p)->pre_finalize_data_size();
+         off_t current_size = (*p)->current_data_size();
+         off = this->allocate(current_size, (*p)->addralign(), startoff);
+         if (off == -1)
+           {
+             if (is_debugging_enabled(DEBUG_INCREMENTAL))
+               this->free_list_.dump();
+             gold_assert((*p)->output_section() != NULL);
+             gold_fallback(_("out of patch space for section %s; "
+                             "relink with --incremental-full"),
+                           (*p)->output_section()->name());
+           }
+         (*p)->set_file_offset(off);
+         (*p)->finalize_data_size();
+         if ((*p)->data_size() > current_size)
+           {
+             gold_assert((*p)->output_section() != NULL);
+             gold_fallback(_("%s: section changed size; "
+                             "relink with --incremental-full"),
+                           (*p)->output_section()->name());
+           }
+         gold_debug(DEBUG_INCREMENTAL,
+                    "set_section_offsets: %08lx %08lx %s",
+                    static_cast<long>(off),
+                    static_cast<long>((*p)->data_size()),
+                    ((*p)->output_section() != NULL
+                     ? (*p)->output_section()->name() : "(special)"));
+       }
+
       off += (*p)->data_size();
+      if (off > maxoff)
+        maxoff = off;
 
       // At this point the name must be set.
       if (pass != STRTAB_AFTER_POSTPROCESSING_SECTIONS_PASS)
        this->namepool_.add((*p)->name(), false, NULL);
     }
-  return off;
+  return maxoff;
 }
 
 // Set the section indexes of all the sections not associated with a
@@ -2923,9 +3429,8 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
   else
     gold_unreachable();
 
-  off_t off = *poff;
-  off = align_address(off, align);
-  off_t startoff = off;
+  // Compute file offsets relative to the start of the symtab section.
+  off_t off = 0;
 
   // 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.
@@ -2958,7 +3463,7 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
     }
 
   unsigned int local_symcount = local_symbol_index;
-  gold_assert(static_cast<off_t>(local_symcount * symsize) == off - startoff);
+  gold_assert(static_cast<off_t>(local_symcount * symsize) == off);
 
   off_t dynoff;
   size_t dyn_global_index;
@@ -2979,6 +3484,7 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
                  == this->dynsym_section_->data_size() - locsize);
     }
 
+  off_t global_off = off;
   off = symtab->finalize(off, dynoff, dyn_global_index, dyncount,
                         &this->sympool_, &local_symcount);
 
@@ -2993,8 +3499,7 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
                                                          false);
       this->symtab_section_ = osymtab;
 
-      Output_section_data* pos = new Output_data_fixed_space(off - startoff,
-                                                            align,
+      Output_section_data* pos = new Output_data_fixed_space(off, align,
                                                             "** symtab");
       osymtab->add_output_section_data(pos);
 
@@ -3014,7 +3519,7 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
                                      elfcpp::SHT_SYMTAB_SHNDX, 0,
                                      ORDER_INVALID, false);
 
-         size_t symcount = (off - startoff) / symsize;
+         size_t symcount = off / symsize;
          this->symtab_xindex_ = new Output_symtab_xindex(symcount);
 
          osymtab_xindex->add_output_section_data(this->symtab_xindex_);
@@ -3040,13 +3545,30 @@ Layout::create_symtab_sections(const Input_objects* input_objects,
       Output_section_data* pstr = new Output_data_strtab(&this->sympool_);
       ostrtab->add_output_section_data(pstr);
 
-      osymtab->set_file_offset(startoff);
+      off_t symtab_off;
+      if (!parameters->incremental_update())
+       symtab_off = align_address(*poff, align);
+      else
+       {
+         symtab_off = this->allocate(off, align, *poff);
+          if (off == -1)
+           gold_fallback(_("out of patch space for symbol table; "
+                           "relink with --incremental-full"));
+         gold_debug(DEBUG_INCREMENTAL,
+                    "create_symtab_sections: %08lx %08lx .symtab",
+                    static_cast<long>(symtab_off),
+                    static_cast<long>(off));
+       }
+
+      symtab->set_file_offset(symtab_off + global_off);
+      osymtab->set_file_offset(symtab_off);
       osymtab->finalize_data_size();
       osymtab->set_link_section(ostrtab);
       osymtab->set_info(local_symcount);
       osymtab->set_entsize(symsize);
 
-      *poff = off;
+      if (symtab_off + off > *poff)
+       *poff = symtab_off + off;
     }
 }
 
@@ -3093,10 +3615,25 @@ Layout::create_shdrs(const Output_section* shstrtab_section, off_t* poff)
                                      &this->unattached_section_list_,
                                      &this->namepool_,
                                      shstrtab_section);
-  off_t off = align_address(*poff, oshdrs->addralign());
+  off_t off;
+  if (!parameters->incremental_update())
+    off = align_address(*poff, oshdrs->addralign());
+  else
+    {
+      oshdrs->pre_finalize_data_size();
+      off = this->allocate(oshdrs->data_size(), oshdrs->addralign(), *poff);
+      if (off == -1)
+         gold_fallback(_("out of patch space for section header table; "
+                         "relink with --incremental-full"));
+      gold_debug(DEBUG_INCREMENTAL,
+                "create_shdrs: %08lx %08lx (section header table)",
+                static_cast<long>(off),
+                static_cast<long>(off + oshdrs->data_size()));
+    }
   oshdrs->set_address_and_file_offset(0, off);
   off += oshdrs->data_size();
-  *poff = off;
+  if (off > *poff)
+    *poff = off;
   this->section_headers_ = oshdrs;
 }
 
@@ -3184,20 +3721,27 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects,
                                                       ORDER_DYNAMIC_LINKER,
                                                       false);
 
-  Output_section_data* odata = new Output_data_fixed_space(index * symsize,
-                                                          align,
-                                                          "** dynsym");
-  dynsym->add_output_section_data(odata);
+  // Check for NULL as a linker script may discard .dynsym.
+  if (dynsym != NULL)
+    {
+      Output_section_data* odata = new Output_data_fixed_space(index * symsize,
+                                                              align,
+                                                              "** dynsym");
+      dynsym->add_output_section_data(odata);
 
-  dynsym->set_info(local_symcount);
-  dynsym->set_entsize(symsize);
-  dynsym->set_addralign(align);
+      dynsym->set_info(local_symcount);
+      dynsym->set_entsize(symsize);
+      dynsym->set_addralign(align);
 
-  this->dynsym_section_ = dynsym;
+      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);
+  if (odyn != NULL)
+    {
+      odyn->add_section_address(elfcpp::DT_SYMTAB, dynsym);
+      odyn->add_constant(elfcpp::DT_SYMENT, symsize);
+    }
 
   // If there are more than SHN_LORESERVE allocated sections, we
   // create a .dynsym_shndx section.  It is possible that we don't
@@ -3214,20 +3758,23 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects,
                                    elfcpp::SHF_ALLOC,
                                    false, ORDER_DYNAMIC_LINKER, false);
 
-      this->dynsym_xindex_ = new Output_symtab_xindex(index);
+      if (dynsym_xindex != NULL)
+       {
+         this->dynsym_xindex_ = new Output_symtab_xindex(index);
 
-      dynsym_xindex->add_output_section_data(this->dynsym_xindex_);
+         dynsym_xindex->add_output_section_data(this->dynsym_xindex_);
 
-      dynsym_xindex->set_link_section(dynsym);
-      dynsym_xindex->set_addralign(4);
-      dynsym_xindex->set_entsize(4);
+         dynsym_xindex->set_link_section(dynsym);
+         dynsym_xindex->set_addralign(4);
+         dynsym_xindex->set_entsize(4);
 
-      dynsym_xindex->set_after_input_sections();
+         dynsym_xindex->set_after_input_sections();
 
-      // This tells the driver code to wait until the symbol table has
-      // written out before writing out the postprocessing sections,
-      // including the .dynsym_shndx section.
-      this->any_postprocessing_sections_ = true;
+         // This tells the driver code to wait until the symbol table
+         // has written out before writing out the postprocessing
+         // sections, including the .dynsym_shndx section.
+         this->any_postprocessing_sections_ = true;
+       }
     }
 
   // Create the dynamic string table section.
@@ -3239,16 +3786,24 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects,
                                                       ORDER_DYNAMIC_LINKER,
                                                       false);
 
-  Output_section_data* strdata = new Output_data_strtab(&this->dynpool_);
-  dynstr->add_output_section_data(strdata);
+  if (dynstr != NULL)
+    {
+      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);
+      if (dynsym != NULL)
+       dynsym->set_link_section(dynstr);
+      if (this->dynamic_section_ != NULL)
+       this->dynamic_section_->set_link_section(dynstr);
 
-  odyn->add_section_address(elfcpp::DT_STRTAB, dynstr);
-  odyn->add_section_size(elfcpp::DT_STRSZ, dynstr);
+      if (odyn != NULL)
+       {
+         odyn->add_section_address(elfcpp::DT_STRTAB, dynstr);
+         odyn->add_section_size(elfcpp::DT_STRSZ, dynstr);
+       }
 
-  *pdynstr = dynstr;
+      *pdynstr = dynstr;
+    }
 
   // Create the hash tables.
 
@@ -3269,12 +3824,18 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects,
                                                                   hashlen,
                                                                   align,
                                                                   "** hash");
-      hashsec->add_output_section_data(hashdata);
+      if (hashsec != NULL && hashdata != NULL)
+       hashsec->add_output_section_data(hashdata);
 
-      hashsec->set_link_section(dynsym);
-      hashsec->set_entsize(4);
+      if (hashsec != NULL)
+       {
+         if (dynsym != NULL)
+           hashsec->set_link_section(dynsym);
+         hashsec->set_entsize(4);
+       }
 
-      odyn->add_section_address(elfcpp::DT_HASH, hashsec);
+      if (odyn != NULL)
+       odyn->add_section_address(elfcpp::DT_HASH, hashsec);
     }
 
   if (strcmp(parameters->options().hash_style(), "gnu") == 0
@@ -3294,17 +3855,23 @@ Layout::create_dynamic_symtab(const Input_objects* input_objects,
                                                                   hashlen,
                                                                   align,
                                                                   "** hash");
-      hashsec->add_output_section_data(hashdata);
+      if (hashsec != NULL && hashdata != NULL)
+       hashsec->add_output_section_data(hashdata);
 
-      hashsec->set_link_section(dynsym);
+      if (hashsec != NULL)
+       {
+         if (dynsym != NULL)
+           hashsec->set_link_section(dynsym);
 
-      // For a 64-bit target, the entries in .gnu.hash do not have a
-      // uniform size, so we only set the entry size for a 32-bit
-      // target.
-      if (parameters->target().get_size() == 32)
-       hashsec->set_entsize(4);
+         // For a 64-bit target, the entries in .gnu.hash do not have
+         // a uniform size, so we only set the entry size for a
+         // 32-bit target.
+         if (parameters->target().get_size() == 32)
+           hashsec->set_entsize(4);
 
-      odyn->add_section_address(elfcpp::DT_GNU_HASH, hashsec);
+         if (odyn != NULL)
+           odyn->add_section_address(elfcpp::DT_GNU_HASH, hashsec);
+       }
     }
 }
 
@@ -3314,7 +3881,8 @@ void
 Layout::assign_local_dynsym_offsets(const Input_objects* input_objects)
 {
   Output_section* dynsym = this->dynsym_section_;
-  gold_assert(dynsym != NULL);
+  if (dynsym == NULL)
+    return;
 
   off_t off = dynsym->offset();
 
@@ -3395,46 +3963,59 @@ Layout::sized_create_version_sections(
                                                     ORDER_DYNAMIC_LINKER,
                                                     false);
 
-  unsigned char* vbuf;
-  unsigned int vsize;
-  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,
-                                                           "** versions");
-
-  vsec->add_output_section_data(vdata);
-  vsec->set_entsize(2);
-  vsec->set_link_section(this->dynsym_section_);
+  // Check for NULL since a linker script may discard this section.
+  if (vsec != NULL)
+    {
+      unsigned char* vbuf;
+      unsigned int vsize;
+      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,
+                                                               "** versions");
+
+      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 (odyn != NULL && vsec != NULL)
+    odyn->add_section_address(elfcpp::DT_VERSYM, vsec);
 
   if (versions->any_defs())
     {
       Output_section* vdsec;
-      vdsec= this->choose_output_section(NULL, ".gnu.version_d",
-                                        elfcpp::SHT_GNU_verdef,
-                                        elfcpp::SHF_ALLOC,
-                                        false, ORDER_DYNAMIC_LINKER, false);
+      vdsec = this->choose_output_section(NULL, ".gnu.version_d",
+                                         elfcpp::SHT_GNU_verdef,
+                                         elfcpp::SHF_ALLOC,
+                                         false, ORDER_DYNAMIC_LINKER, false);
 
-      unsigned char* vdbuf;
-      unsigned int vdsize;
-      unsigned int vdentries;
-      versions->def_section_contents<size, big_endian>(&this->dynpool_, &vdbuf,
-                                                      &vdsize, &vdentries);
+      if (vdsec != NULL)
+       {
+         unsigned char* vdbuf;
+         unsigned int vdsize;
+         unsigned int vdentries;
+         versions->def_section_contents<size, big_endian>(&this->dynpool_,
+                                                          &vdbuf, &vdsize,
+                                                          &vdentries);
 
-      Output_section_data* vddata =
-       new Output_data_const_buffer(vdbuf, vdsize, 4, "** version defs");
+         Output_section_data* vddata =
+           new Output_data_const_buffer(vdbuf, vdsize, 4, "** version defs");
 
-      vdsec->add_output_section_data(vddata);
-      vdsec->set_link_section(dynstr);
-      vdsec->set_info(vdentries);
+         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 (odyn != NULL)
+           {
+             odyn->add_section_address(elfcpp::DT_VERDEF, vdsec);
+             odyn->add_constant(elfcpp::DT_VERDEFNUM, vdentries);
+           }
+       }
     }
 
   if (versions->any_needs())
@@ -3445,22 +4026,28 @@ Layout::sized_create_version_sections(
                                          elfcpp::SHF_ALLOC,
                                          false, ORDER_DYNAMIC_LINKER, false);
 
-      unsigned char* vnbuf;
-      unsigned int vnsize;
-      unsigned int vnentries;
-      versions->need_section_contents<size, big_endian>(&this->dynpool_,
-                                                       &vnbuf, &vnsize,
-                                                       &vnentries);
+      if (vnsec != NULL)
+       {
+         unsigned char* vnbuf;
+         unsigned int vnsize;
+         unsigned int vnentries;
+         versions->need_section_contents<size, big_endian>(&this->dynpool_,
+                                                           &vnbuf, &vnsize,
+                                                           &vnentries);
 
-      Output_section_data* vndata =
-       new Output_data_const_buffer(vnbuf, vnsize, 4, "** version refs");
+         Output_section_data* vndata =
+           new Output_data_const_buffer(vnbuf, vnsize, 4, "** version refs");
 
-      vnsec->add_output_section_data(vndata);
-      vnsec->set_link_section(dynstr);
-      vnsec->set_info(vnentries);
+         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);
+         if (odyn != NULL)
+           {
+             odyn->add_section_address(elfcpp::DT_VERNEED, vnsec);
+             odyn->add_constant(elfcpp::DT_VERNEEDNUM, vnentries);
+           }
+       }
     }
 }
 
@@ -3469,6 +4056,8 @@ Layout::sized_create_version_sections(
 void
 Layout::create_interp(const Target* target)
 {
+  gold_assert(this->interp_segment_ == NULL);
+
   const char* interp = parameters->options().dynamic_linker();
   if (interp == NULL)
     {
@@ -3485,14 +4074,8 @@ Layout::create_interp(const Target* target)
                                                     elfcpp::SHF_ALLOC,
                                                     false, ORDER_INTERP,
                                                     false);
-  osec->add_output_section_data(odata);
-
-  if (!this->script_options_->saw_phdrs_clause())
-    {
-      Output_segment* oseg = this->make_output_segment(elfcpp::PT_INTERP,
-                                                      elfcpp::PF_R);
-      oseg->add_output_section_to_nonload(osec, elfcpp::PF_R);
-    }
+  if (osec != NULL)
+    osec->add_output_section_data(odata);
 }
 
 // Add dynamic tags for the PLT and the dynamic relocs.  This is
@@ -3508,7 +4091,8 @@ Layout::create_interp(const Target* target)
 // some targets have multiple reloc sections in PLT_REL.
 
 // If DYN_REL is not NULL, it is used for DT_REL/DT_RELA,
-// DT_RELSZ/DT_RELASZ, DT_RELENT/DT_RELAENT.
+// DT_RELSZ/DT_RELASZ, DT_RELENT/DT_RELAENT.  Again we use the output
+// section.
 
 // If ADD_DEBUG is true, we add a DT_DEBUG entry when generating an
 // executable.
@@ -3537,13 +4121,16 @@ Layout::add_target_dynamic_tags(bool use_rel, const Output_data* plt_got,
   if (dyn_rel != NULL && dyn_rel->output_section() != NULL)
     {
       odyn->add_section_address(use_rel ? elfcpp::DT_REL : elfcpp::DT_RELA,
-                               dyn_rel);
-      if (plt_rel != NULL && dynrel_includes_plt)
+                               dyn_rel->output_section());
+      if (plt_rel != NULL
+         && plt_rel->output_section() != NULL
+         && dynrel_includes_plt)
        odyn->add_section_size(use_rel ? elfcpp::DT_RELSZ : elfcpp::DT_RELASZ,
-                              dyn_rel, plt_rel);
+                              dyn_rel->output_section(),
+                              plt_rel->output_section());
       else
        odyn->add_section_size(use_rel ? elfcpp::DT_RELSZ : elfcpp::DT_RELASZ,
-                              dyn_rel);
+                              dyn_rel->output_section());
       const int size = parameters->target().get_size();
       elfcpp::DT rel_tag;
       int rel_size;
@@ -3594,7 +4181,8 @@ void
 Layout::finish_dynamic_section(const Input_objects* input_objects,
                               const Symbol_table* symtab)
 {
-  if (!this->script_options_->saw_phdrs_clause())
+  if (!this->script_options_->saw_phdrs_clause()
+      && this->dynamic_section_ != NULL)
     {
       Output_segment* oseg = this->make_output_segment(elfcpp::PT_DYNAMIC,
                                                       (elfcpp::PF_R
@@ -3604,13 +4192,14 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
     }
 
   Output_data_dynamic* const odyn = this->dynamic_data_;
+  if (odyn == NULL)
+    return;
 
   for (Input_objects::Dynobj_iterator p = input_objects->dynobj_begin();
        p != input_objects->dynobj_end();
        ++p)
     {
-      if (!(*p)->is_needed()
-         && (*p)->input_file()->options().as_needed())
+      if (!(*p)->is_needed() && (*p)->as_needed())
        {
          // This dynamic object was linked with --as-needed, but it
          // is not needed.
@@ -3697,7 +4286,8 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
            p != this->segment_list_.end();
            ++p)
         {
-          if (((*p)->flags() & elfcpp::PF_W) == 0
+          if ((*p)->type() == elfcpp::PT_LOAD
+             && ((*p)->flags() & elfcpp::PF_W) == 0
               && (*p)->has_dynamic_reloc())
             {
               have_textrel = true;
@@ -3717,7 +4307,7 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
         {
           if (((*p)->flags() & elfcpp::SHF_ALLOC) != 0
               && ((*p)->flags() & elfcpp::SHF_WRITE) == 0
-              && ((*p)->has_dynamic_reloc()))
+              && (*p)->has_dynamic_reloc())
             {
               have_textrel = true;
               break;
@@ -3725,8 +4315,18 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
         }
     }
 
-  // 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.
+  if (parameters->options().filter() != NULL)
+    odyn->add_string(elfcpp::DT_FILTER, parameters->options().filter());
+  if (parameters->options().any_auxiliary())
+    {
+      for (options::String_set::const_iterator p =
+            parameters->options().auxiliary_begin();
+          p != parameters->options().auxiliary_end();
+          ++p)
+       odyn->add_string(elfcpp::DT_AUXILIARY, *p);
+    }
+
+  // Add a DT_FLAGS entry if necessary.
   unsigned int flags = 0;
   if (have_textrel)
     {
@@ -3752,7 +4352,8 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
     }
   if (parameters->options().now())
     flags |= elfcpp::DF_BIND_NOW;
-  odyn->add_constant(elfcpp::DT_FLAGS, flags);
+  if (flags != 0)
+    odyn->add_constant(elfcpp::DT_FLAGS, flags);
 
   flags = 0;
   if (parameters->options().initfirst())
@@ -3777,7 +4378,9 @@ Layout::finish_dynamic_section(const Input_objects* input_objects,
     flags |= elfcpp::DF_1_ORIGIN;
   if (parameters->options().now())
     flags |= elfcpp::DF_1_NOW;
-  if (flags)
+  if (parameters->options().Bgroup())
+    flags |= elfcpp::DF_1_GROUP;
+  if (flags != 0)
     odyn->add_constant(elfcpp::DT_FLAGS_1, flags);
 }
 
@@ -3788,7 +4391,11 @@ void
 Layout::set_dynamic_symbol_size(const Symbol_table* symtab)
 {
   Output_data_dynamic* const odyn = this->dynamic_data_;
+  if (odyn == NULL)
+    return;
   odyn->finalize_data_size();
+  if (this->dynamic_symbol_ == NULL)
+    return;
   off_t data_size = odyn->data_size();
   const int size = parameters->target().get_size();
   if (size == 32)
@@ -3808,8 +4415,6 @@ Layout::set_dynamic_symbol_size(const Symbol_table* symtab)
 const Layout::Section_name_mapping Layout::section_name_mapping[] =
 {
   MAPPING_INIT(".text.", ".text"),
-  MAPPING_INIT(".ctors.", ".ctors"),
-  MAPPING_INIT(".dtors.", ".dtors"),
   MAPPING_INIT(".rodata.", ".rodata"),
   MAPPING_INIT(".data.rel.ro.local", ".data.rel.ro.local"),
   MAPPING_INIT(".data.rel.ro", ".data.rel.ro"),
@@ -3861,7 +4466,8 @@ const int Layout::section_name_mapping_count =
 // length of NAME.
 
 const char*
-Layout::output_section_name(const char* name, size_t* plen)
+Layout::output_section_name(const Relobj* relobj, const char* name,
+                           size_t* plen)
 {
   // gcc 4.3 generates the following sorts of section names when it
   // needs a section name specific to a function:
@@ -3908,23 +4514,62 @@ Layout::output_section_name(const char* name, size_t* plen)
        }
     }
 
-  // Compressed debug sections should be mapped to the corresponding
-  // uncompressed section.
-  if (is_compressed_debug_section(name))
+  // As an additional complication, .ctors sections are output in
+  // either .ctors or .init_array sections, and .dtors sections are
+  // output in either .dtors or .fini_array sections.
+  if (is_prefix_of(".ctors.", name) || is_prefix_of(".dtors.", name))
     {
-      size_t len = strlen(name);
-      char* uncompressed_name = new char[len];
-      uncompressed_name[0] = '.';
-      gold_assert(name[0] == '.' && name[1] == 'z');
-      strncpy(&uncompressed_name[1], &name[2], len - 2);
-      uncompressed_name[len - 1] = '\0';
-      *plen = len - 1;
-      return uncompressed_name;
+      if (parameters->options().ctors_in_init_array())
+       {
+         *plen = 11;
+         return name[1] == 'c' ? ".init_array" : ".fini_array";
+       }
+      else
+       {
+         *plen = 6;
+         return name[1] == 'c' ? ".ctors" : ".dtors";
+       }
+    }
+  if (parameters->options().ctors_in_init_array()
+      && (strcmp(name, ".ctors") == 0 || strcmp(name, ".dtors") == 0))
+    {
+      // To make .init_array/.fini_array work with gcc we must exclude
+      // .ctors and .dtors sections from the crtbegin and crtend
+      // files.
+      if (relobj == NULL
+         || (!Layout::match_file_name(relobj, "crtbegin")
+             && !Layout::match_file_name(relobj, "crtend")))
+       {
+         *plen = 11;
+         return name[1] == 'c' ? ".init_array" : ".fini_array";
+       }
     }
 
   return name;
 }
 
+// Return true if RELOBJ is an input file whose base name matches
+// FILE_NAME.  The base name must have an extension of ".o", and must
+// be exactly FILE_NAME.o or FILE_NAME, one character, ".o".  This is
+// to match crtbegin.o as well as crtbeginS.o without getting confused
+// by other possibilities.  Overall matching the file name this way is
+// a dreadful hack, but the GNU linker does it in order to better
+// support gcc, and we need to be compatible.
+
+bool
+Layout::match_file_name(const Relobj* relobj, const char* match)
+{
+  const std::string& file_name(relobj->name());
+  const char* base_name = lbasename(file_name.c_str());
+  size_t match_len = strlen(match);
+  if (strncmp(base_name, match, match_len) != 0)
+    return false;
+  size_t base_len = strlen(base_name);
+  if (base_len != match_len + 2 && base_len != match_len + 3)
+    return false;
+  return memcmp(base_name + base_len - 2, ".o", 2) == 0;
+}
+
 // Check if a comdat group or .gnu.linkonce section with the given
 // NAME is selected for the link.  If there is already a section,
 // *KEPT_SECTION is set to point to the existing section and the
@@ -4028,10 +4673,33 @@ Layout::make_output_segment(elfcpp::Elf_Word type, elfcpp::Elf_Word flags)
     this->tls_segment_ = oseg;
   else if (type == elfcpp::PT_GNU_RELRO)
     this->relro_segment_ = oseg;
+  else if (type == elfcpp::PT_INTERP)
+    this->interp_segment_ = oseg;
 
   return oseg;
 }
 
+// Return the file offset of the normal symbol table.
+
+off_t
+Layout::symtab_section_offset() const
+{
+  if (this->symtab_section_ != NULL)
+    return this->symtab_section_->offset();
+  return 0;
+}
+
+// Return the section index of the normal symbol table.  It may have
+// been stripped by the -s/--strip-all option.
+
+unsigned int
+Layout::symtab_section_shndx() const
+{
+  if (this->symtab_section_ != NULL)
+    return this->symtab_section_->out_shndx();
+  return 0;
+}
+
 // 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.
@@ -4381,7 +5049,40 @@ Close_task_runner::run(Workqueue*, const Task*)
 #ifdef HAVE_TARGET_32_LITTLE
 template
 Output_section*
-Layout::layout<32, false>(Sized_relobj<32, false>* object, unsigned int shndx,
+Layout::init_fixed_output_section<32, false>(
+    const char* name,
+    elfcpp::Shdr<32, false>& shdr);
+#endif
+
+#ifdef HAVE_TARGET_32_BIG
+template
+Output_section*
+Layout::init_fixed_output_section<32, true>(
+    const char* name,
+    elfcpp::Shdr<32, true>& shdr);
+#endif
+
+#ifdef HAVE_TARGET_64_LITTLE
+template
+Output_section*
+Layout::init_fixed_output_section<64, false>(
+    const char* name,
+    elfcpp::Shdr<64, false>& shdr);
+#endif
+
+#ifdef HAVE_TARGET_64_BIG
+template
+Output_section*
+Layout::init_fixed_output_section<64, true>(
+    const char* name,
+    elfcpp::Shdr<64, true>& shdr);
+#endif
+
+#ifdef HAVE_TARGET_32_LITTLE
+template
+Output_section*
+Layout::layout<32, false>(Sized_relobj_file<32, false>* object,
+                         unsigned int shndx,
                          const char* name,
                          const elfcpp::Shdr<32, false>& shdr,
                          unsigned int, unsigned int, off_t*);
@@ -4390,7 +5091,8 @@ Layout::layout<32, false>(Sized_relobj<32, false>* object, unsigned int shndx,
 #ifdef HAVE_TARGET_32_BIG
 template
 Output_section*
-Layout::layout<32, true>(Sized_relobj<32, true>* object, unsigned int shndx,
+Layout::layout<32, true>(Sized_relobj_file<32, true>* object,
+                        unsigned int shndx,
                         const char* name,
                         const elfcpp::Shdr<32, true>& shdr,
                         unsigned int, unsigned int, off_t*);
@@ -4399,7 +5101,8 @@ Layout::layout<32, true>(Sized_relobj<32, true>* object, unsigned int shndx,
 #ifdef HAVE_TARGET_64_LITTLE
 template
 Output_section*
-Layout::layout<64, false>(Sized_relobj<64, false>* object, unsigned int shndx,
+Layout::layout<64, false>(Sized_relobj_file<64, false>* object,
+                         unsigned int shndx,
                          const char* name,
                          const elfcpp::Shdr<64, false>& shdr,
                          unsigned int, unsigned int, off_t*);
@@ -4408,7 +5111,8 @@ Layout::layout<64, false>(Sized_relobj<64, false>* object, unsigned int shndx,
 #ifdef HAVE_TARGET_64_BIG
 template
 Output_section*
-Layout::layout<64, true>(Sized_relobj<64, true>* object, unsigned int shndx,
+Layout::layout<64, true>(Sized_relobj_file<64, true>* object,
+                        unsigned int shndx,
                         const char* name,
                         const elfcpp::Shdr<64, true>& shdr,
                         unsigned int, unsigned int, off_t*);
@@ -4417,7 +5121,7 @@ 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,
+Layout::layout_reloc<32, false>(Sized_relobj_file<32, false>* object,
                                unsigned int reloc_shndx,
                                const elfcpp::Shdr<32, false>& shdr,
                                Output_section* data_section,
@@ -4427,7 +5131,7 @@ Layout::layout_reloc<32, false>(Sized_relobj<32, false>* object,
 #ifdef HAVE_TARGET_32_BIG
 template
 Output_section*
-Layout::layout_reloc<32, true>(Sized_relobj<32, true>* object,
+Layout::layout_reloc<32, true>(Sized_relobj_file<32, true>* object,
                               unsigned int reloc_shndx,
                               const elfcpp::Shdr<32, true>& shdr,
                               Output_section* data_section,
@@ -4437,7 +5141,7 @@ Layout::layout_reloc<32, true>(Sized_relobj<32, true>* object,
 #ifdef HAVE_TARGET_64_LITTLE
 template
 Output_section*
-Layout::layout_reloc<64, false>(Sized_relobj<64, false>* object,
+Layout::layout_reloc<64, false>(Sized_relobj_file<64, false>* object,
                                unsigned int reloc_shndx,
                                const elfcpp::Shdr<64, false>& shdr,
                                Output_section* data_section,
@@ -4447,7 +5151,7 @@ Layout::layout_reloc<64, false>(Sized_relobj<64, false>* object,
 #ifdef HAVE_TARGET_64_BIG
 template
 Output_section*
-Layout::layout_reloc<64, true>(Sized_relobj<64, true>* object,
+Layout::layout_reloc<64, true>(Sized_relobj_file<64, true>* object,
                               unsigned int reloc_shndx,
                               const elfcpp::Shdr<64, true>& shdr,
                               Output_section* data_section,
@@ -4458,7 +5162,7 @@ Layout::layout_reloc<64, true>(Sized_relobj<64, true>* object,
 template
 void
 Layout::layout_group<32, false>(Symbol_table* symtab,
-                               Sized_relobj<32, false>* object,
+                               Sized_relobj_file<32, false>* object,
                                unsigned int,
                                const char* group_section_name,
                                const char* signature,
@@ -4471,7 +5175,7 @@ Layout::layout_group<32, false>(Symbol_table* symtab,
 template
 void
 Layout::layout_group<32, true>(Symbol_table* symtab,
-                              Sized_relobj<32, true>* object,
+                              Sized_relobj_file<32, true>* object,
                               unsigned int,
                               const char* group_section_name,
                               const char* signature,
@@ -4484,7 +5188,7 @@ Layout::layout_group<32, true>(Symbol_table* symtab,
 template
 void
 Layout::layout_group<64, false>(Symbol_table* symtab,
-                               Sized_relobj<64, false>* object,
+                               Sized_relobj_file<64, false>* object,
                                unsigned int,
                                const char* group_section_name,
                                const char* signature,
@@ -4497,7 +5201,7 @@ Layout::layout_group<64, false>(Symbol_table* symtab,
 template
 void
 Layout::layout_group<64, true>(Symbol_table* symtab,
-                              Sized_relobj<64, true>* object,
+                              Sized_relobj_file<64, true>* object,
                               unsigned int,
                               const char* group_section_name,
                               const char* signature,
@@ -4509,7 +5213,7 @@ Layout::layout_group<64, true>(Symbol_table* symtab,
 #ifdef HAVE_TARGET_32_LITTLE
 template
 Output_section*
-Layout::layout_eh_frame<32, false>(Sized_relobj<32, false>* object,
+Layout::layout_eh_frame<32, false>(Sized_relobj_file<32, false>* object,
                                   const unsigned char* symbols,
                                   off_t symbols_size,
                                   const unsigned char* symbol_names,
@@ -4524,9 +5228,9 @@ Layout::layout_eh_frame<32, false>(Sized_relobj<32, false>* object,
 #ifdef HAVE_TARGET_32_BIG
 template
 Output_section*
-Layout::layout_eh_frame<32, true>(Sized_relobj<32, true>* object,
-                                  const unsigned char* symbols,
-                                  off_t symbols_size,
+Layout::layout_eh_frame<32, true>(Sized_relobj_file<32, true>* object,
+                                 const unsigned char* symbols,
+                                 off_t symbols_size,
                                  const unsigned char* symbol_names,
                                  off_t symbol_names_size,
                                  unsigned int shndx,
@@ -4539,7 +5243,7 @@ Layout::layout_eh_frame<32, true>(Sized_relobj<32, true>* object,
 #ifdef HAVE_TARGET_64_LITTLE
 template
 Output_section*
-Layout::layout_eh_frame<64, false>(Sized_relobj<64, false>* object,
+Layout::layout_eh_frame<64, false>(Sized_relobj_file<64, false>* object,
                                   const unsigned char* symbols,
                                   off_t symbols_size,
                                   const unsigned char* symbol_names,
@@ -4554,9 +5258,9 @@ Layout::layout_eh_frame<64, false>(Sized_relobj<64, false>* object,
 #ifdef HAVE_TARGET_64_BIG
 template
 Output_section*
-Layout::layout_eh_frame<64, true>(Sized_relobj<64, true>* object,
-                                  const unsigned char* symbols,
-                                  off_t symbols_size,
+Layout::layout_eh_frame<64, true>(Sized_relobj_file<64, true>* object,
+                                 const unsigned char* symbols,
+                                 off_t symbols_size,
                                  const unsigned char* symbol_names,
                                  off_t symbol_names_size,
                                  unsigned int shndx,
This page took 0.048225 seconds and 4 git commands to generate.