Add Spanish translation to gold.
[binutils-gdb.git] / gold / script-sections.cc
index 6c8a7f5b2b34677e7a1ef46fd7e271cbd57df928..990a1a2c7712357da122691f1a6a60d53588a195 100644 (file)
@@ -25,6 +25,7 @@
 #include <cstring>
 #include <algorithm>
 #include <list>
+#include <map>
 #include <string>
 #include <vector>
 #include <fnmatch.h>
@@ -53,6 +54,17 @@ class Sections_element
   virtual ~Sections_element()
   { }
 
+  // Record that an output section is relro.
+  virtual void
+  set_is_relro()
+  { }
+
+  // Create any required output sections.  The only real
+  // implementation is in Output_section_definition.
+  virtual void
+  create_sections(Layout*)
+  { }
+
   // Add any symbol being defined to the symbol table.
   virtual void
   add_symbols_to_table(Symbol_table*)
@@ -60,7 +72,7 @@ class Sections_element
 
   // Finalize symbols and check assertions.
   virtual void
-  finalize_symbols(Symbol_table*, const Layout*, bool*, uint64_t*)
+  finalize_symbols(Symbol_table*, const Layout*, uint64_t*)
   { }
 
   // Return the output section name to use for an input file name and
@@ -73,13 +85,13 @@ class Sections_element
   // Return whether to place an orphan output section after this
   // element.
   virtual bool
-  place_orphan_here(const Output_section *, bool*) const
+  place_orphan_here(const Output_section *, bool*, bool*) const
   { return false; }
 
   // Set section addresses.  This includes applying assignments if the
   // the expression is an absolute value.
   virtual void
-  set_section_addresses(Symbol_table*, Layout*, bool*, uint64_t*)
+  set_section_addresses(Symbol_table*, Layout*, uint64_t*, uint64_t*)
   { }
 
   // Check a constraint (ONLY_IF_RO, etc.) on an output section.  If
@@ -96,6 +108,34 @@ class Sections_element
   alternate_constraint(Output_section_definition*, Section_constraint)
   { return false; }
 
+  // Get the list of segments to use for an allocated section when
+  // using a PHDRS clause.  If this is an allocated section, return
+  // the Output_section, and set *PHDRS_LIST (the first parameter) to
+  // the list of PHDRS to which it should be attached.  If the PHDRS
+  // were not specified, don't change *PHDRS_LIST.  When not returning
+  // NULL, set *ORPHAN (the second parameter) according to whether
+  // this is an orphan section--one that is not mentioned in the
+  // linker script.
+  virtual Output_section*
+  allocate_to_segment(String_list**, bool*)
+  { return NULL; }
+
+  // Look for an output section by name and return the address, the
+  // load address, the alignment, and the size.  This is used when an
+  // expression refers to an output section which was not actually
+  // created.  This returns true if the section was found, false
+  // otherwise.  The only real definition is for
+  // Output_section_definition.
+  virtual bool
+  get_output_section_info(const char*, uint64_t*, uint64_t*, uint64_t*,
+                          uint64_t*) const
+  { return false; }
+
+  // Return the associated Output_section if there is one.
+  virtual Output_section*
+  get_output_section() const
+  { return NULL; }
+
   // Print the element for debugging purposes.
   virtual void
   print(FILE* f) const = 0;
@@ -119,10 +159,9 @@ class Sections_element_assignment : public Sections_element
   // Finalize the symbol.
   void
   finalize_symbols(Symbol_table* symtab, const Layout* layout,
-                  bool* dot_has_value, uint64_t* dot_value)
+                  uint64_t* dot_value)
   {
-    this->assignment_.finalize_with_dot(symtab, layout, *dot_has_value,
-                                       *dot_value);
+    this->assignment_.finalize_with_dot(symtab, layout, *dot_value, NULL);
   }
 
   // Set the section address.  There is no section here, but if the
@@ -130,10 +169,9 @@ class Sections_element_assignment : public Sections_element
   // absolute symbols when setting dot.
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout,
-                       bool* dot_has_value, uint64_t* dot_value)
+                       uint64_t* dot_value, uint64_t*)
   {
-    this->assignment_.set_if_absolute(symtab, layout, true, *dot_has_value,
-                                     *dot_value);
+    this->assignment_.set_if_absolute(symtab, layout, true, *dot_value);
   }
 
   // Print for debugging.
@@ -161,25 +199,25 @@ class Sections_element_dot_assignment : public Sections_element
   // Finalize the symbol.
   void
   finalize_symbols(Symbol_table* symtab, const Layout* layout,
-                  bool* dot_has_value, uint64_t* dot_value)
+                  uint64_t* dot_value)
   {
-    bool dummy;
-    *dot_value = this->val_->eval_with_dot(symtab, layout, *dot_has_value,
-                                          *dot_value, &dummy);
-    *dot_has_value = true;
+    // We ignore the section of the result because outside of an
+    // output section definition the dot symbol is always considered
+    // to be absolute.
+    Output_section* dummy;
+    *dot_value = this->val_->eval_with_dot(symtab, layout, true, *dot_value,
+                                          NULL, &dummy);
   }
 
   // Update the dot symbol while setting section addresses.
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout,
-                       bool* dot_has_value, uint64_t* dot_value)
+                       uint64_t* dot_value, uint64_t* load_address)
   {
-    bool is_absolute;
-    *dot_value = this->val_->eval_with_dot(symtab, layout, *dot_has_value,
-                                          *dot_value, &is_absolute);
-    if (!is_absolute)
-      gold_error(_("dot set to non-absolute value"));
-    *dot_has_value = true;
+    Output_section* dummy;
+    *dot_value = this->val_->eval_with_dot(symtab, layout, false, *dot_value,
+                                          NULL, &dummy);
+    *load_address = *dot_value;
   }
 
   // Print for debugging.
@@ -207,8 +245,7 @@ class Sections_element_assertion : public Sections_element
 
   // Check the assertion.
   void
-  finalize_symbols(Symbol_table* symtab, const Layout* layout, bool*,
-                  uint64_t*)
+  finalize_symbols(Symbol_table* symtab, const Layout* layout, uint64_t*)
   { this->assertion_.check(symtab, layout); }
 
   // Print for debugging.
@@ -237,6 +274,11 @@ class Output_section_element
   virtual ~Output_section_element()
   { }
 
+  // Return whether this element requires an output section to exist.
+  virtual bool
+  needs_output_section() const
+  { return false; }
+
   // Add any symbol being defined to the symbol table.
   virtual void
   add_symbols_to_table(Symbol_table*)
@@ -244,7 +286,7 @@ class Output_section_element
 
   // Finalize symbols and check assertions.
   virtual void
-  finalize_symbols(Symbol_table*, const Layout*, bool*, uint64_t*)
+  finalize_symbols(Symbol_table*, const Layout*, uint64_t*, Output_section**)
   { }
 
   // Return whether this element matches FILE_NAME and SECTION_NAME.
@@ -257,7 +299,8 @@ class Output_section_element
   // the expression is an absolute value.
   virtual void
   set_section_addresses(Symbol_table*, Layout*, Output_section*, uint64_t,
-                       uint64_t*, std::string*, Input_section_list*)
+                       uint64_t*, Output_section**, std::string*,
+                       Input_section_list*)
   { }
 
   // Print the element for debugging purposes.
@@ -303,10 +346,10 @@ class Output_section_element_assignment : public Output_section_element
   // Finalize the symbol.
   void
   finalize_symbols(Symbol_table* symtab, const Layout* layout,
-                  bool* dot_has_value, uint64_t* dot_value)
+                  uint64_t* dot_value, Output_section** dot_section)
   {
-    this->assignment_.finalize_with_dot(symtab, layout, *dot_has_value,
-                                       *dot_value);
+    this->assignment_.finalize_with_dot(symtab, layout, *dot_value,
+                                       *dot_section);
   }
 
   // Set the section address.  There is no section here, but if the
@@ -314,10 +357,10 @@ class Output_section_element_assignment : public Output_section_element
   // absolute symbols when setting dot.
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
-                       uint64_t, uint64_t* dot_value, std::string*,
-                       Input_section_list*)
+                       uint64_t, uint64_t* dot_value, Output_section**,
+                       std::string*, Input_section_list*)
   {
-    this->assignment_.set_if_absolute(symtab, layout, true, true, *dot_value);
+    this->assignment_.set_if_absolute(symtab, layout, true, *dot_value);
   }
 
   // Print for debugging.
@@ -344,19 +387,17 @@ class Output_section_element_dot_assignment : public Output_section_element
   // Finalize the symbol.
   void
   finalize_symbols(Symbol_table* symtab, const Layout* layout,
-                  bool* dot_has_value, uint64_t* dot_value)
+                  uint64_t* dot_value, Output_section** dot_section)
   {
-    bool dummy;
-    *dot_value = this->val_->eval_with_dot(symtab, layout, *dot_has_value,
-                                          *dot_value, &dummy);
-    *dot_has_value = true;
+    *dot_value = this->val_->eval_with_dot(symtab, layout, true, *dot_value,
+                                          *dot_section, dot_section);
   }
 
   // Update the dot symbol while setting section addresses.
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
-                       uint64_t, uint64_t* dot_value, std::string*,
-                       Input_section_list*);
+                       uint64_t, uint64_t* dot_value, Output_section**,
+                       std::string*, Input_section_list*);
 
   // Print for debugging.
   void
@@ -380,14 +421,13 @@ Output_section_element_dot_assignment::set_section_addresses(
     Output_section* output_section,
     uint64_t,
     uint64_t* dot_value,
+    Output_section** dot_section,
     std::string* fill,
     Input_section_list*)
 {
-  bool is_absolute;
-  uint64_t next_dot = this->val_->eval_with_dot(symtab, layout, true,
-                                               *dot_value, &is_absolute);
-  if (!is_absolute)
-    gold_error(_("dot set to non-absolute value"));
+  uint64_t next_dot = this->val_->eval_with_dot(symtab, layout, false,
+                                               *dot_value, *dot_section,
+                                               dot_section);
   if (next_dot < *dot_value)
     gold_error(_("dot may not move backward"));
   if (next_dot > *dot_value && output_section != NULL)
@@ -396,7 +436,7 @@ Output_section_element_dot_assignment::set_section_addresses(
                                                              - *dot_value);
       Output_section_data* posd;
       if (fill->empty())
-       posd = new Output_data_fixed_space(length, 0);
+       posd = new Output_data_zero_fill(length, 0);
       else
        {
          std::string this_fill = this->get_fill_string(fill, length);
@@ -428,109 +468,165 @@ class Output_section_element_assertion : public Output_section_element
   Script_assertion assertion_;
 };
 
-// A data item in an output section.
+// We use a special instance of Output_section_data to handle BYTE,
+// SHORT, etc.  This permits forward references to symbols in the
+// expressions.
 
-class Output_section_element_data : public Output_section_element
+class Output_data_expression : public Output_section_data
 {
  public:
-  Output_section_element_data(int size, bool is_signed, Expression* val)
-    : size_(size), is_signed_(is_signed), val_(val)
+  Output_data_expression(int size, bool is_signed, Expression* val,
+                        const Symbol_table* symtab, const Layout* layout,
+                        uint64_t dot_value, Output_section* dot_section)
+    : Output_section_data(size, 0),
+      is_signed_(is_signed), val_(val), symtab_(symtab),
+      layout_(layout), dot_value_(dot_value), dot_section_(dot_section)
   { }
 
-  // Finalize symbols--we just need to update dot.
+ protected:
+  // Write the data to the output file.
   void
-  finalize_symbols(Symbol_table*, const Layout*, bool*, uint64_t* dot_value)
-  { *dot_value += this->size_; }
+  do_write(Output_file*);
 
-  // Store the value in the section.
+  // Write the data to a buffer.
   void
-  set_section_addresses(Symbol_table*, Layout*, Output_section*, uint64_t,
-                       uint64_t* dot_value, std::string*,
-                       Input_section_list*);
+  do_write_to_buffer(unsigned char*);
 
-  // Print for debugging.
+  // Write to a map file.
   void
-  print(FILE*) const;
+  do_print_to_mapfile(Mapfile* mapfile) const
+  { mapfile->print_output_data(this, _("** expression")); }
 
  private:
   template<bool big_endian>
-  std::string
-  set_fill_string(uint64_t);
+  void
+  endian_write_to_buffer(uint64_t, unsigned char*);
 
-  // The size in bytes.
-  int size_;
-  // Whether the value is signed.
   bool is_signed_;
-  // The value.
   Expression* val_;
+  const Symbol_table* symtab_;
+  const Layout* layout_;
+  uint64_t dot_value_;
+  Output_section* dot_section_;
 };
 
-// Store the value in the section.
+// Write the data element to the output file.
 
 void
-Output_section_element_data::set_section_addresses(Symbol_table* symtab,
-                                                  Layout* layout,
-                                                  Output_section* os,
-                                                  uint64_t,
-                                                  uint64_t* dot_value,
-                                                  std::string*,
-                                                  Input_section_list*)
+Output_data_expression::do_write(Output_file* of)
 {
-  gold_assert(os != NULL);
+  unsigned char* view = of->get_output_view(this->offset(), this->data_size());
+  this->write_to_buffer(view);
+  of->write_output_view(this->offset(), this->data_size(), view);
+}
 
-  bool is_absolute;
-  uint64_t val = this->val_->eval_with_dot(symtab, layout, true, *dot_value,
-                                          &is_absolute);
-  if (!is_absolute)
-    gold_error(_("data directive with non-absolute value"));
+// Write the data element to a buffer.
 
-  std::string fill;
-  if (parameters->is_big_endian())
-    fill = this->set_fill_string<true>(val);
-  else
-    fill = this->set_fill_string<false>(val);
-
-  os->add_output_section_data(new Output_data_const(fill, 0));
+void
+Output_data_expression::do_write_to_buffer(unsigned char* buf)
+{
+  Output_section* dummy;
+  uint64_t val = this->val_->eval_with_dot(this->symtab_, this->layout_,
+                                          true, this->dot_value_,
+                                          this->dot_section_, &dummy);
 
-  *dot_value += this->size_;
+  if (parameters->target().is_big_endian())
+    this->endian_write_to_buffer<true>(val, buf);
+  else
+    this->endian_write_to_buffer<false>(val, buf);
 }
 
-// Get the value to store in a std::string.
-
 template<bool big_endian>
-std::string
-    Output_section_element_data::set_fill_string(uint64_t val)
+void
+Output_data_expression::endian_write_to_buffer(uint64_t val,
+                                              unsigned char* buf)
 {
-  std::string ret;
-  unsigned char buf[8];
-  switch (this->size_)
+  switch (this->data_size())
     {
     case 1:
       elfcpp::Swap_unaligned<8, big_endian>::writeval(buf, val);
-      ret.assign(reinterpret_cast<char*>(buf), 1);
       break;
     case 2:
       elfcpp::Swap_unaligned<16, big_endian>::writeval(buf, val);
-      ret.assign(reinterpret_cast<char*>(buf), 2);
       break;
     case 4:
       elfcpp::Swap_unaligned<32, big_endian>::writeval(buf, val);
-      ret.assign(reinterpret_cast<char*>(buf), 4);
       break;
     case 8:
-      if (parameters->get_size() == 32)
+      if (parameters->target().get_size() == 32)
        {
          val &= 0xffffffff;
          if (this->is_signed_ && (val & 0x80000000) != 0)
            val |= 0xffffffff00000000LL;
        }
       elfcpp::Swap_unaligned<64, big_endian>::writeval(buf, val);
-      ret.assign(reinterpret_cast<char*>(buf), 8);
       break;
     default:
       gold_unreachable();
     }
-  return ret;
+}
+
+// A data item in an output section.
+
+class Output_section_element_data : public Output_section_element
+{
+ public:
+  Output_section_element_data(int size, bool is_signed, Expression* val)
+    : size_(size), is_signed_(is_signed), val_(val)
+  { }
+
+  // If there is a data item, then we must create an output section.
+  bool
+  needs_output_section() const
+  { return true; }
+
+  // Finalize symbols--we just need to update dot.
+  void
+  finalize_symbols(Symbol_table*, const Layout*, uint64_t* dot_value,
+                  Output_section**)
+  { *dot_value += this->size_; }
+
+  // Store the value in the section.
+  void
+  set_section_addresses(Symbol_table*, Layout*, Output_section*, uint64_t,
+                       uint64_t* dot_value, Output_section**, std::string*,
+                       Input_section_list*);
+
+  // Print for debugging.
+  void
+  print(FILE*) const;
+
+ private:
+  // The size in bytes.
+  int size_;
+  // Whether the value is signed.
+  bool is_signed_;
+  // The value.
+  Expression* val_;
+};
+
+// Store the value in the section.
+
+void
+Output_section_element_data::set_section_addresses(
+    Symbol_table* symtab,
+    Layout* layout,
+    Output_section* os,
+    uint64_t,
+    uint64_t* dot_value,
+    Output_section** dot_section,
+    std::string*,
+    Input_section_list*)
+{
+  gold_assert(os != NULL);
+  os->add_output_section_data(new Output_data_expression(this->size_,
+                                                        this->is_signed_,
+                                                        this->val_,
+                                                        symtab,
+                                                        layout,
+                                                        *dot_value,
+                                                        *dot_section));
+  *dot_value += this->size_;
 }
 
 // Print for debugging.
@@ -576,15 +672,16 @@ class Output_section_element_fill : public Output_section_element
   // Update the fill value while setting section addresses.
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
-                       uint64_t, uint64_t* dot_value, std::string* fill,
-                       Input_section_list*)
+                       uint64_t, uint64_t* dot_value,
+                       Output_section** dot_section,
+                       std::string* fill, Input_section_list*)
   {
-    bool is_absolute;
-    uint64_t fill_val = this->val_->eval_with_dot(symtab, layout, true,
-                                                 *dot_value,
-                                                 &is_absolute);
-    if (!is_absolute)
-      gold_error(_("fill set to non-absolute value"));
+    Output_section* fill_section;
+    uint64_t fill_val = this->val_->eval_with_dot(symtab, layout, false,
+                                                 *dot_value, *dot_section,
+                                                 &fill_section);
+    if (fill_section != NULL)
+      gold_warning(_("fill value is not absolute"));
     // FIXME: The GNU linker supports fill values of arbitrary length.
     unsigned char fill_buff[4];
     elfcpp::Swap_unaligned<32, true>::writeval(fill_buff, fill_val);
@@ -623,11 +720,11 @@ class Output_section_element_input : public Output_section_element
 
   // Finalize symbols--just update the value of the dot symbol.
   void
-  finalize_symbols(Symbol_table*, const Layout*, bool* dot_has_value,
-                  uint64_t* dot_value)
+  finalize_symbols(Symbol_table*, const Layout*, uint64_t* dot_value,
+                  Output_section** dot_section)
   {
     *dot_value = this->final_dot_value_;
-    *dot_has_value = true;
+    *dot_section = this->final_dot_section_;
   }
 
   // See whether we match FILE_NAME and SECTION_NAME as an input
@@ -639,7 +736,8 @@ class Output_section_element_input : public Output_section_element
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout, Output_section*,
                        uint64_t subalign, uint64_t* dot_value,
-                       std::string* fill, Input_section_list*);
+                       Output_section**, std::string* fill,
+                       Input_section_list*);
 
   // Print for debugging.
   void
@@ -697,6 +795,9 @@ class Output_section_element_input : public Output_section_element
   bool keep_;
   // The value of dot after including all matching sections.
   uint64_t final_dot_value_;
+  // The section where dot is defined after including all matching
+  // sections.
+  Output_section* final_dot_section_;
 };
 
 // Construct Output_section_element_input.  The parser records strings
@@ -712,7 +813,8 @@ Output_section_element_input::Output_section_element_input(
     filename_exclusions_(),
     input_section_patterns_(),
     keep_(keep),
-    final_dot_value_(0)
+    final_dot_value_(0),
+    final_dot_section_(NULL)
 {
   // The filename pattern "*" is common, and matches all files.  Turn
   // it into the empty string.
@@ -875,6 +977,7 @@ Output_section_element_input::set_section_addresses(
     Output_section* output_section,
     uint64_t subalign,
     uint64_t* dot_value,
+    Output_section** dot_section,
     std::string* fill,
     Input_section_list* input_sections)
 {
@@ -991,6 +1094,7 @@ Output_section_element_input::set_section_addresses(
     }
 
   this->final_dot_value_ = *dot_value;
+  this->final_dot_section_ = *dot_section;
 }
 
 // Print for debugging.
@@ -1137,13 +1241,22 @@ class Output_section_definition : public Sections_element
   void
   add_input_section(const Input_section_spec* spec, bool keep);
 
+  // Record that the output section is relro.
+  void
+  set_is_relro()
+  { this->is_relro_ = true; }
+
+  // Create any required output sections.
+  void
+  create_sections(Layout*);
+
   // Add any symbols being defined to the symbol table.
   void
   add_symbols_to_table(Symbol_table* symtab);
 
   // Finalize symbols and check assertions.
   void
-  finalize_symbols(Symbol_table*, const Layout*, bool*, uint64_t*);
+  finalize_symbols(Symbol_table*, const Layout*, uint64_t*);
 
   // Return the output section name to use for an input file name and
   // section name.
@@ -1153,12 +1266,12 @@ class Output_section_definition : public Sections_element
 
   // Return whether to place an orphan section after this one.
   bool
-  place_orphan_here(const Output_section *os, bool* exact) const;
+  place_orphan_here(const Output_section *os, bool* exact, bool*) const;
 
   // Set the section address.
   void
   set_section_addresses(Symbol_table* symtab, Layout* layout,
-                       bool* dot_has_value, uint64_t* dot_value);
+                       uint64_t* dot_value, uint64_t* load_address);
 
   // Check a constraint (ONLY_IF_RO, etc.) on an output section.  If
   // this section is constrained, and the input sections do not match,
@@ -1172,6 +1285,25 @@ class Output_section_definition : public Sections_element
   bool
   alternate_constraint(Output_section_definition*, Section_constraint);
 
+  // Get the list of segments to use for an allocated section when
+  // using a PHDRS clause.
+  Output_section*
+  allocate_to_segment(String_list** phdrs_list, bool* orphan);
+
+  // Look for an output section by name and return the address, the
+  // load address, the alignment, and the size.  This is used when an
+  // expression refers to an output section which was not actually
+  // created.  This returns true if the section was found, false
+  // otherwise.
+  bool
+  get_output_section_info(const char*, uint64_t*, uint64_t*, uint64_t*,
+                          uint64_t*) const;
+
+  // Return the associated Output_section if there is one.
+  Output_section*
+  get_output_section() const
+  { return this->output_section_; }
+
   // Print the contents to the FILE.  This is for debugging.
   void
   print(FILE*) const;
@@ -1193,11 +1325,22 @@ class Output_section_definition : public Sections_element
   Section_constraint constraint_;
   // The fill value.  This may be NULL.
   Expression* fill_;
+  // The list of segments this section should go into.  This may be
+  // NULL.
+  String_list* phdrs_;
   // The list of elements defining the section.
   Output_section_elements elements_;
   // The Output_section created for this definition.  This will be
   // NULL if none was created.
   Output_section* output_section_;
+  // The address after it has been evaluated.
+  uint64_t evaluated_address_;
+  // The load address after it has been evaluated.
+  uint64_t evaluated_load_address_;
+  // The alignment after it has been evaluated.
+  uint64_t evaluated_addralign_;
+  // The output section is relro.
+  bool is_relro_;
 };
 
 // Constructor.
@@ -1213,8 +1356,13 @@ Output_section_definition::Output_section_definition(
     subalign_(header->subalign),
     constraint_(header->constraint),
     fill_(NULL),
+    phdrs_(NULL),
     elements_(),
-    output_section_(NULL)
+    output_section_(NULL),
+    evaluated_address_(0),
+    evaluated_load_address_(0),
+    evaluated_addralign_(0),
+    is_relro_(false)
 {
 }
 
@@ -1224,6 +1372,7 @@ void
 Output_section_definition::finish(const Parser_output_section_trailer* trailer)
 {
   this->fill_ = trailer->fill;
+  this->phdrs_ = trailer->phdrs;
 }
 
 // Add a symbol to be defined.
@@ -1294,6 +1443,27 @@ Output_section_definition::add_input_section(const Input_section_spec* spec,
   this->elements_.push_back(p);
 }
 
+// Create any required output sections.  We need an output section if
+// there is a data statement here.
+
+void
+Output_section_definition::create_sections(Layout* layout)
+{
+  if (this->output_section_ != NULL)
+    return;
+  for (Output_section_elements::const_iterator p = this->elements_.begin();
+       p != this->elements_.end();
+       ++p)
+    {
+      if ((*p)->needs_output_section())
+       {
+         const char* name = this->name_.c_str();
+         this->output_section_ = layout->make_output_section_for_script(name);
+         return;
+       }
+    }
+}
+
 // Add any symbols being defined to the symbol table.
 
 void
@@ -1310,7 +1480,6 @@ Output_section_definition::add_symbols_to_table(Symbol_table* symtab)
 void
 Output_section_definition::finalize_symbols(Symbol_table* symtab,
                                            const Layout* layout,
-                                           bool* dot_has_value,
                                            uint64_t* dot_value)
 {
   if (this->output_section_ != NULL)
@@ -1320,28 +1489,28 @@ Output_section_definition::finalize_symbols(Symbol_table* symtab,
       uint64_t address = *dot_value;
       if (this->address_ != NULL)
        {
-         bool dummy;
-         address = this->address_->eval_with_dot(symtab, layout,
-                                                 *dot_has_value, *dot_value,
+         Output_section* dummy;
+         address = this->address_->eval_with_dot(symtab, layout, true,
+                                                 *dot_value, NULL,
                                                  &dummy);
        }
       if (this->align_ != NULL)
        {
-         bool dummy;
-         uint64_t align = this->align_->eval_with_dot(symtab, layout,
-                                                      *dot_has_value,
+         Output_section* dummy;
+         uint64_t align = this->align_->eval_with_dot(symtab, layout, true,
                                                       *dot_value,
+                                                      NULL,
                                                       &dummy);
          address = align_address(address, align);
        }
       *dot_value = address;
     }
-  *dot_has_value = true;
 
+  Output_section* dot_section = this->output_section_;
   for (Output_section_elements::iterator p = this->elements_.begin();
        p != this->elements_.end();
        ++p)
-    (*p)->finalize_symbols(symtab, layout, dot_has_value, dot_value);
+    (*p)->finalize_symbols(symtab, layout, dot_value, &dot_section);
 }
 
 // Return the output section name to use for an input section name.
@@ -1374,8 +1543,11 @@ Output_section_definition::output_section_name(const char* file_name,
 
 bool
 Output_section_definition::place_orphan_here(const Output_section *os,
-                                            bool* exact) const
+                                            bool* exact,
+                                            bool* is_relro) const
 {
+  *is_relro = this->is_relro_;
+
   // Check for the simple case first.
   if (this->output_section_ != NULL
       && this->output_section_->type() == os->type()
@@ -1392,58 +1564,92 @@ Output_section_definition::place_orphan_here(const Output_section *os,
 
   if (os->type() == elfcpp::SHT_NOBITS)
     {
+      if (this->name_ == ".bss")
+       {
+         *exact = true;
+         return true;
+       }
       if (this->output_section_ != NULL
          && this->output_section_->type() == elfcpp::SHT_NOBITS)
        return true;
-      if (this->name_ == ".bss")
-       return true;
     }
   else if (os->type() == elfcpp::SHT_NOTE)
     {
       if (this->output_section_ != NULL
          && this->output_section_->type() == elfcpp::SHT_NOTE)
+       {
+         *exact = true;
+         return true;
+       }
+      if (this->name_.compare(0, 5, ".note") == 0)
+       {
+         *exact = true;
+         return true;
+       }
+      if (this->name_ == ".interp")
        return true;
-      if (this->name_ == ".interp"
-         || this->name_.compare(0, 5, ".note") == 0)
+      if (this->output_section_ != NULL
+         && this->output_section_->type() == elfcpp::SHT_PROGBITS
+         && (this->output_section_->flags() & elfcpp::SHF_WRITE) == 0)
        return true;
     }
   else if (os->type() == elfcpp::SHT_REL || os->type() == elfcpp::SHT_RELA)
     {
+      if (this->name_.compare(0, 4, ".rel") == 0)
+       {
+         *exact = true;
+         return true;
+       }
       if (this->output_section_ != NULL
          && (this->output_section_->type() == elfcpp::SHT_REL
              || this->output_section_->type() == elfcpp::SHT_RELA))
-       return true;
-      if (this->name_.compare(0, 4, ".rel") == 0)
+       {
+         *exact = true;
+         return true;
+       }
+      if (this->output_section_ != NULL
+         && this->output_section_->type() == elfcpp::SHT_PROGBITS
+         && (this->output_section_->flags() & elfcpp::SHF_WRITE) == 0)
        return true;
     }
   else if (os->type() == elfcpp::SHT_PROGBITS
           && (os->flags() & elfcpp::SHF_WRITE) != 0)
     {
+      if (this->name_ == ".data")
+       {
+         *exact = true;
+         return true;
+       }
       if (this->output_section_ != NULL
          && this->output_section_->type() == elfcpp::SHT_PROGBITS
          && (this->output_section_->flags() & elfcpp::SHF_WRITE) != 0)
        return true;
-      if (this->name_ == ".data")
-       return true;
     }
   else if (os->type() == elfcpp::SHT_PROGBITS
           && (os->flags() & elfcpp::SHF_EXECINSTR) != 0)
     {
+      if (this->name_ == ".text")
+       {
+         *exact = true;
+         return true;
+       }
       if (this->output_section_ != NULL
          && this->output_section_->type() == elfcpp::SHT_PROGBITS
          && (this->output_section_->flags() & elfcpp::SHF_EXECINSTR) != 0)
        return true;
-      if (this->name_ == ".text")
-       return true;
     }
-  else if (os->type() == elfcpp::SHT_PROGBITS)
+  else if (os->type() == elfcpp::SHT_PROGBITS
+          || (os->type() != elfcpp::SHT_PROGBITS
+              && (os->flags() & elfcpp::SHF_WRITE) == 0))
     {
+      if (this->name_ == ".rodata")
+       {
+         *exact = true;
+         return true;
+       }
       if (this->output_section_ != NULL
          && this->output_section_->type() == elfcpp::SHT_PROGBITS
-         && (this->output_section_->flags() & elfcpp::SHF_WRITE) == 0
-         && (this->output_section_->flags() & elfcpp::SHF_EXECINSTR) == 0)
-       return true;
-      if (this->name_ == ".rodata")
+         && (this->output_section_->flags() & elfcpp::SHF_WRITE) == 0)
        return true;
     }
 
@@ -1457,25 +1663,17 @@ Output_section_definition::place_orphan_here(const Output_section *os,
 void
 Output_section_definition::set_section_addresses(Symbol_table* symtab,
                                                 Layout* layout,
-                                                bool* dot_has_value,
-                                                uint64_t* dot_value)
+                                                uint64_t* dot_value,
+                                                 uint64_t* load_address)
 {
-  bool is_absolute;
   uint64_t address;
-  if (this->address_ != NULL)
-    {
-      address = this->address_->eval_with_dot(symtab, layout, *dot_has_value,
-                                             *dot_value, &is_absolute);
-      if (!is_absolute)
-       gold_error(_("address of section %s is not absolute"),
-                  this->name_.c_str());
-    }
+  if (this->address_ == NULL)
+    address = *dot_value;
   else
     {
-      if (!*dot_has_value)
-       gold_error(_("no address given for section %s"),
-                  this->name_.c_str());
-      address = *dot_value;
+      Output_section* dummy;
+      address = this->address_->eval_with_dot(symtab, layout, true,
+                                             *dot_value, NULL, &dummy);
     }
 
   uint64_t align;
@@ -1488,19 +1686,21 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
     }
   else
     {
-      align = this->align_->eval_with_dot(symtab, layout, *dot_has_value,
-                                         *dot_value, &is_absolute);
-      if (!is_absolute)
-       gold_error(_("alignment of section %s is not absolute"),
-                  this->name_.c_str());
+      Output_section* align_section;
+      align = this->align_->eval_with_dot(symtab, layout, true, *dot_value,
+                                         NULL, &align_section);
+      if (align_section != NULL)
+       gold_warning(_("alignment of section %s is not absolute"),
+                    this->name_.c_str());
       if (this->output_section_ != NULL)
        this->output_section_->set_addralign(align);
     }
 
   address = align_address(address, align);
 
+  uint64_t start_address = address;
+
   *dot_value = address;
-  *dot_has_value = true;
 
   // The address of non-SHF_ALLOC sections is forced to zero,
   // regardless of what the linker script wants.
@@ -1508,15 +1708,20 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
       && (this->output_section_->flags() & elfcpp::SHF_ALLOC) != 0)
     this->output_section_->set_address(address);
 
-  if (this->load_address_ != NULL && this->output_section_ != NULL)
+  this->evaluated_address_ = address;
+  this->evaluated_addralign_ = align;
+
+  if (this->load_address_ == NULL)
+    this->evaluated_load_address_ = address;
+  else
     {
+      Output_section* dummy;
       uint64_t load_address =
-       this->load_address_->eval_with_dot(symtab, layout, *dot_has_value,
-                                          *dot_value, &is_absolute);
-      if (!is_absolute)
-       gold_error(_("load address of section %s is not absolute"),
-                  this->name_.c_str());
-      this->output_section_->set_load_address(load_address);
+       this->load_address_->eval_with_dot(symtab, layout, true, *dot_value,
+                                          this->output_section_, &dummy);
+      if (this->output_section_ != NULL)
+        this->output_section_->set_load_address(load_address);
+      this->evaluated_load_address_ = load_address;
     }
 
   uint64_t subalign;
@@ -1524,11 +1729,13 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
     subalign = 0;
   else
     {
-      subalign = this->subalign_->eval_with_dot(symtab, layout, *dot_has_value,
-                                               *dot_value, &is_absolute);
-      if (!is_absolute)
-       gold_error(_("subalign of section %s is not absolute"),
-                  this->name_.c_str());
+      Output_section* subalign_section;
+      subalign = this->subalign_->eval_with_dot(symtab, layout, true,
+                                               *dot_value, NULL,
+                                               &subalign_section);
+      if (subalign_section != NULL)
+       gold_warning(_("subalign of section %s is not absolute"),
+                    this->name_.c_str());
     }
 
   std::string fill;
@@ -1536,13 +1743,14 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
     {
       // FIXME: The GNU linker supports fill values of arbitrary
       // length.
-      uint64_t fill_val = this->fill_->eval_with_dot(symtab, layout,
-                                                    *dot_has_value,
+      Output_section* fill_section;
+      uint64_t fill_val = this->fill_->eval_with_dot(symtab, layout, true,
                                                     *dot_value,
-                                                    &is_absolute);
-      if (!is_absolute)
-       gold_error(_("fill of section %s is not absolute"),
-                  this->name_.c_str());
+                                                    NULL,
+                                                    &fill_section);
+      if (fill_section != NULL)
+       gold_warning(_("fill of section %s is not absolute"),
+                    this->name_.c_str());
       unsigned char fill_buff[4];
       elfcpp::Swap_unaligned<32, true>::writeval(fill_buff, fill_val);
       fill.assign(reinterpret_cast<char*>(fill_buff), 4);
@@ -1560,13 +1768,29 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
       *dot_value = address;
     }
 
+  Output_section* dot_section = this->output_section_;
   for (Output_section_elements::iterator p = this->elements_.begin();
        p != this->elements_.end();
        ++p)
     (*p)->set_section_addresses(symtab, layout, this->output_section_,
-                               subalign, dot_value, &fill, &input_sections);
+                               subalign, dot_value, &dot_section, &fill,
+                               &input_sections);
 
   gold_assert(input_sections.empty());
+
+  if (this->load_address_ == NULL || this->output_section_ == NULL)
+    *load_address = *dot_value;
+  else
+    *load_address = (this->output_section_->load_address()
+                     + (*dot_value - start_address));
+
+  if (this->output_section_ != NULL)
+    {
+      if (this->is_relro_)
+       this->output_section_->set_is_relro();
+      else
+       this->output_section_->clear_is_relro();
+    }
 }
 
 // Check a constraint (ONLY_IF_RO, etc.) on an output section.  If
@@ -1648,6 +1872,65 @@ Output_section_definition::alternate_constraint(
   this->output_section_ = posd->output_section_;
   posd->output_section_ = NULL;
 
+  if (this->is_relro_)
+    this->output_section_->set_is_relro();
+  else
+    this->output_section_->clear_is_relro();
+
+  return true;
+}
+
+// Get the list of segments to use for an allocated section when using
+// a PHDRS clause.
+
+Output_section*
+Output_section_definition::allocate_to_segment(String_list** phdrs_list,
+                                              bool* orphan)
+{
+  if (this->output_section_ == NULL)
+    return NULL;
+  if ((this->output_section_->flags() & elfcpp::SHF_ALLOC) == 0)
+    return NULL;
+  *orphan = false;
+  if (this->phdrs_ != NULL)
+    *phdrs_list = this->phdrs_;
+  return this->output_section_;
+}
+
+// Look for an output section by name and return the address, the load
+// address, the alignment, and the size.  This is used when an
+// expression refers to an output section which was not actually
+// created.  This returns true if the section was found, false
+// otherwise.
+
+bool
+Output_section_definition::get_output_section_info(const char* name,
+                                                   uint64_t* address,
+                                                   uint64_t* load_address,
+                                                   uint64_t* addralign,
+                                                   uint64_t* size) const
+{
+  if (this->name_ != name)
+    return false;
+
+  if (this->output_section_ != NULL)
+    {
+      *address = this->output_section_->address();
+      if (this->output_section_->has_load_address())
+        *load_address = this->output_section_->load_address();
+      else
+        *load_address = *address;
+      *addralign = this->output_section_->addralign();
+      *size = this->output_section_->current_data_size();
+    }
+  else
+    {
+      *address = this->evaluated_address_;
+      *load_address = this->evaluated_load_address_;
+      *addralign = this->evaluated_addralign_;
+      *size = 0;
+    }
+
   return true;
 }
 
@@ -1702,6 +1985,14 @@ Output_section_definition::print(FILE* f) const
       this->fill_->print(f);
     }
 
+  if (this->phdrs_ != NULL)
+    {
+      for (String_list::const_iterator p = this->phdrs_->begin();
+          p != this->phdrs_->end();
+          ++p)
+       fprintf(f, " :%s", p->c_str());
+    }
+
   fprintf(f, "\n");
 }
 
@@ -1719,11 +2010,21 @@ class Orphan_output_section : public Sections_element
 
   // Return whether to place an orphan section after this one.
   bool
-  place_orphan_here(const Output_section *os, bool* exact) const;
+  place_orphan_here(const Output_section *os, bool* exact, bool*) const;
 
   // Set section addresses.
   void
-  set_section_addresses(Symbol_table*, Layout*, bool*, uint64_t*);
+  set_section_addresses(Symbol_table*, Layout*, uint64_t*, uint64_t*);
+
+  // Get the list of segments to use for an allocated section when
+  // using a PHDRS clause.
+  Output_section*
+  allocate_to_segment(String_list**, bool*);
+
+  // Return the associated Output_section.
+  Output_section*
+  get_output_section() const
+  { return this->os_; }
 
   // Print for debugging.
   void
@@ -1741,12 +2042,14 @@ class Orphan_output_section : public Sections_element
 
 bool
 Orphan_output_section::place_orphan_here(const Output_section* os,
-                                        bool* exact) const
+                                        bool* exact,
+                                        bool* is_relro) const
 {
   if (this->os_->type() == os->type()
       && this->os_->flags() == os->flags())
     {
       *exact = true;
+      *is_relro = this->os_->is_relro();
       return true;
     }
   return false;
@@ -1756,19 +2059,23 @@ Orphan_output_section::place_orphan_here(const Output_section* os,
 
 void
 Orphan_output_section::set_section_addresses(Symbol_table*, Layout*,
-                                            bool* dot_has_value,
-                                            uint64_t* dot_value)
+                                            uint64_t* dot_value,
+                                             uint64_t* load_address)
 {
   typedef std::list<std::pair<Relobj*, unsigned int> > Input_section_list;
 
-  if (!*dot_has_value)
-    gold_error(_("no address for orphan section %s"), this->os_->name());
+  bool have_load_address = *load_address != *dot_value;
 
   uint64_t address = *dot_value;
   address = align_address(address, this->os_->addralign());
 
   if ((this->os_->flags() & elfcpp::SHF_ALLOC) != 0)
-    this->os_->set_address(address);
+    {
+      this->os_->set_address(address);
+      if (have_load_address)
+        this->os_->set_load_address(align_address(*load_address,
+                                                  this->os_->addralign()));
+    }
 
   Input_section_list input_sections;
   address += this->os_->get_input_sections(address, "", &input_sections);
@@ -1790,20 +2097,167 @@ Orphan_output_section::set_section_addresses(Symbol_table*, Layout*,
       }
 
       address = align_address(address, addralign);
-      this->os_->add_input_section_for_script(p->first, p->second, size, 0);
+      this->os_->add_input_section_for_script(p->first, p->second, size,
+                                              addralign);
       address += size;
     }
 
+  if (!have_load_address)
+    *load_address = address;
+  else
+    *load_address += address - *dot_value;
+
   *dot_value = address;
 }
 
+// Get the list of segments to use for an allocated section when using
+// a PHDRS clause.  If this is an allocated section, return the
+// Output_section.  We don't change the list of segments.
+
+Output_section*
+Orphan_output_section::allocate_to_segment(String_list**, bool* orphan)
+{
+  if ((this->os_->flags() & elfcpp::SHF_ALLOC) == 0)
+    return NULL;
+  *orphan = true;
+  return this->os_;
+}
+
+// Class Phdrs_element.  A program header from a PHDRS clause.
+
+class Phdrs_element
+{
+ public:
+  Phdrs_element(const char* name, size_t namelen, unsigned int type,
+               bool includes_filehdr, bool includes_phdrs,
+               bool is_flags_valid, unsigned int flags,
+               Expression* load_address)
+    : name_(name, namelen), type_(type), includes_filehdr_(includes_filehdr),
+      includes_phdrs_(includes_phdrs), is_flags_valid_(is_flags_valid),
+      flags_(flags), load_address_(load_address), load_address_value_(0),
+      segment_(NULL)
+  { }
+
+  // Return the name of this segment.
+  const std::string&
+  name() const
+  { return this->name_; }
+
+  // Return the type of the segment.
+  unsigned int
+  type() const
+  { return this->type_; }
+
+  // Whether to include the file header.
+  bool
+  includes_filehdr() const
+  { return this->includes_filehdr_; }
+
+  // Whether to include the program headers.
+  bool
+  includes_phdrs() const
+  { return this->includes_phdrs_; }
+
+  // Return whether there is a load address.
+  bool
+  has_load_address() const
+  { return this->load_address_ != NULL; }
+
+  // Evaluate the load address expression if there is one.
+  void
+  eval_load_address(Symbol_table* symtab, Layout* layout)
+  {
+    if (this->load_address_ != NULL)
+      this->load_address_value_ = this->load_address_->eval(symtab, layout,
+                                                           true);
+  }
+
+  // Return the load address.
+  uint64_t
+  load_address() const
+  {
+    gold_assert(this->load_address_ != NULL);
+    return this->load_address_value_;
+  }
+
+  // Create the segment.
+  Output_segment*
+  create_segment(Layout* layout)
+  {
+    this->segment_ = layout->make_output_segment(this->type_, this->flags_);
+    return this->segment_;
+  }
+
+  // Return the segment.
+  Output_segment*
+  segment()
+  { return this->segment_; }
+
+  // Set the segment flags if appropriate.
+  void
+  set_flags_if_valid()
+  {
+    if (this->is_flags_valid_)
+      this->segment_->set_flags(this->flags_);
+  }
+
+  // Print for debugging.
+  void
+  print(FILE*) const;
+
+ private:
+  // The name used in the script.
+  std::string name_;
+  // The type of the segment (PT_LOAD, etc.).
+  unsigned int type_;
+  // Whether this segment includes the file header.
+  bool includes_filehdr_;
+  // Whether this segment includes the section headers.
+  bool includes_phdrs_;
+  // Whether the flags were explicitly specified.
+  bool is_flags_valid_;
+  // The flags for this segment (PF_R, etc.) if specified.
+  unsigned int flags_;
+  // The expression for the load address for this segment.  This may
+  // be NULL.
+  Expression* load_address_;
+  // The actual load address from evaluating the expression.
+  uint64_t load_address_value_;
+  // The segment itself.
+  Output_segment* segment_;
+};
+
+// Print for debugging.
+
+void
+Phdrs_element::print(FILE* f) const
+{
+  fprintf(f, "  %s 0x%x", this->name_.c_str(), this->type_);
+  if (this->includes_filehdr_)
+    fprintf(f, " FILEHDR");
+  if (this->includes_phdrs_)
+    fprintf(f, " PHDRS");
+  if (this->is_flags_valid_)
+    fprintf(f, " FLAGS(%u)", this->flags_);
+  if (this->load_address_ != NULL)
+    {
+      fprintf(f, " AT(");
+      this->load_address_->print(f);
+      fprintf(f, ")");
+    }
+  fprintf(f, ";\n");
+}
+
 // Class Script_sections.
 
 Script_sections::Script_sections()
   : saw_sections_clause_(false),
     in_sections_clause_(false),
     sections_elements_(NULL),
-    output_section_(NULL)
+    output_section_(NULL),
+    phdrs_elements_(NULL),
+    data_segment_align_index_(-1U),
+    saw_relro_end_(false)
 {
 }
 
@@ -1931,6 +2385,52 @@ Script_sections::add_input_section(const Input_section_spec* spec, bool keep)
   this->output_section_->add_input_section(spec, keep);
 }
 
+// This is called when we see DATA_SEGMENT_ALIGN.  It means that any
+// subsequent output sections may be relro.
+
+void
+Script_sections::data_segment_align()
+{
+  if (this->data_segment_align_index_ != -1U)
+    gold_error(_("DATA_SEGMENT_ALIGN may only appear once in a linker script"));
+  this->data_segment_align_index_ = this->sections_elements_->size();
+}
+
+// This is called when we see DATA_SEGMENT_RELRO_END.  It means that
+// any output sections seen since DATA_SEGMENT_ALIGN are relro.
+
+void
+Script_sections::data_segment_relro_end()
+{
+  if (this->saw_relro_end_)
+    gold_error(_("DATA_SEGMENT_RELRO_END may only appear once "
+                "in a linker script"));
+  this->saw_relro_end_ = true;
+
+  if (this->data_segment_align_index_ == -1U)
+    gold_error(_("DATA_SEGMENT_RELRO_END must follow DATA_SEGMENT_ALIGN"));
+  else
+    {
+      for (size_t i = this->data_segment_align_index_;
+          i < this->sections_elements_->size();
+          ++i)
+       (*this->sections_elements_)[i]->set_is_relro();
+    }
+}
+
+// Create any required sections.
+
+void
+Script_sections::create_sections(Layout* layout)
+{
+  if (!this->saw_sections_clause_)
+    return;
+  for (Sections_elements::iterator p = this->sections_elements_->begin();
+       p != this->sections_elements_->end();
+       ++p)
+    (*p)->create_sections(layout);
+}
+
 // Add any symbols we are defining to the symbol table.
 
 void
@@ -1951,12 +2451,11 @@ Script_sections::finalize_symbols(Symbol_table* symtab, const Layout* layout)
 {
   if (!this->saw_sections_clause_)
     return;
-  bool dot_has_value = false;
   uint64_t dot_value = 0;
   for (Sections_elements::iterator p = this->sections_elements_->begin();
        p != this->sections_elements_->end();
        ++p)
-    (*p)->finalize_symbols(symtab, layout, &dot_has_value, &dot_value);
+    (*p)->finalize_symbols(symtab, layout, &dot_value);
 }
 
 // Return the name of the output section to use for an input file name
@@ -2003,15 +2502,18 @@ Script_sections::place_orphan(Output_section* os)
 {
   // Look for an output section definition which matches the output
   // section.  Put a marker after that section.
+  bool is_relro = false;
   Sections_elements::iterator place = this->sections_elements_->end();
   for (Sections_elements::iterator p = this->sections_elements_->begin();
        p != this->sections_elements_->end();
        ++p)
     {
-      bool exact;
-      if ((*p)->place_orphan_here(os, &exact))
+      bool exact = false;
+      bool is_relro_here;
+      if ((*p)->place_orphan_here(os, &exact, &is_relro_here))
        {
          place = p;
+         is_relro = is_relro_here;
          if (exact)
            break;
        }
@@ -2022,6 +2524,11 @@ Script_sections::place_orphan(Output_section* os)
     ++place;
 
   this->sections_elements_->insert(place, new Orphan_output_section(os));
+
+  if (is_relro)
+    os->set_is_relro();
+  else
+    os->clear_is_relro();
 }
 
 // Set the addresses of all the output sections.  Walk through all the
@@ -2064,12 +2571,41 @@ Script_sections::set_section_addresses(Symbol_table* symtab, Layout* layout)
        }
     }
 
-  bool dot_has_value = false;
+  // Force the alignment of the first TLS section to be the maximum
+  // alignment of all TLS sections.
+  Output_section* first_tls = NULL;
+  uint64_t tls_align = 0;
+  for (Sections_elements::const_iterator p = this->sections_elements_->begin();
+       p != this->sections_elements_->end();
+       ++p)
+    {
+      Output_section *os = (*p)->get_output_section();
+      if (os != NULL && (os->flags() & elfcpp::SHF_TLS) != 0)
+       {
+         if (first_tls == NULL)
+           first_tls = os;
+         if (os->addralign() > tls_align)
+           tls_align = os->addralign();
+       }
+    }
+  if (first_tls != NULL)
+    first_tls->set_addralign(tls_align);
+
+  // For a relocatable link, we implicitly set dot to zero.
   uint64_t dot_value = 0;
+  uint64_t load_address = 0;
   for (Sections_elements::iterator p = this->sections_elements_->begin();
        p != this->sections_elements_->end();
        ++p)
-    (*p)->set_section_addresses(symtab, layout, &dot_has_value, &dot_value);
+    (*p)->set_section_addresses(symtab, layout, &dot_value, &load_address);
+
+  if (this->phdrs_elements_ != NULL)
+    {
+      for (Phdrs_elements::iterator p = this->phdrs_elements_->begin();
+          p != this->phdrs_elements_->end();
+          ++p)
+       (*p)->eval_load_address(symtab, layout);
+    }
 
   return this->create_segments(layout);
 }
@@ -2129,6 +2665,45 @@ Script_sections::is_bss_section(const Output_section* os)
          && (os->flags() & elfcpp::SHF_TLS) == 0);
 }
 
+// Return the size taken by the file header and the program headers.
+
+size_t
+Script_sections::total_header_size(Layout* layout) const
+{
+  size_t segment_count = layout->segment_count();
+  size_t file_header_size;
+  size_t segment_headers_size;
+  if (parameters->target().get_size() == 32)
+    {
+      file_header_size = elfcpp::Elf_sizes<32>::ehdr_size;
+      segment_headers_size = segment_count * elfcpp::Elf_sizes<32>::phdr_size;
+    }
+  else if (parameters->target().get_size() == 64)
+    {
+      file_header_size = elfcpp::Elf_sizes<64>::ehdr_size;
+      segment_headers_size = segment_count * elfcpp::Elf_sizes<64>::phdr_size;
+    }
+  else
+    gold_unreachable();
+
+  return file_header_size + segment_headers_size;
+}
+
+// Return the amount we have to subtract from the LMA to accomodate
+// headers of the given size.  The complication is that the file
+// header have to be at the start of a page, as otherwise it will not
+// be at the start of the file.
+
+uint64_t
+Script_sections::header_size_adjustment(uint64_t lma,
+                                       size_t sizeof_headers) const
+{
+  const uint64_t abi_pagesize = parameters->target().abi_pagesize();
+  uint64_t hdr_lma = lma - sizeof_headers;
+  hdr_lma &= ~(abi_pagesize - 1);
+  return lma - hdr_lma;
+}
+
 // Create the PT_LOAD segments when using a SECTIONS clause.  Returns
 // the segment which should hold the file header and segment headers,
 // if any.
@@ -2138,9 +2713,12 @@ Script_sections::create_segments(Layout* layout)
 {
   gold_assert(this->saw_sections_clause_);
 
-  if (parameters->output_is_object())
+  if (parameters->options().relocatable())
     return NULL;
 
+  if (this->saw_phdrs_clause())
+    return create_segments_from_phdrs_clause(layout);
+
   Layout::Section_list sections;
   layout->get_allocated_sections(&sections);
 
@@ -2150,7 +2728,7 @@ Script_sections::create_segments(Layout* layout)
   this->create_note_and_tls_segments(layout, &sections);
 
   // Walk through the sections adding them to PT_LOAD segments.
-  const uint64_t abi_pagesize = parameters->target()->abi_pagesize();
+  const uint64_t abi_pagesize = parameters->target().abi_pagesize();
   Output_segment* first_seg = NULL;
   Output_segment* current_seg = NULL;
   bool is_current_seg_readonly = true;
@@ -2191,7 +2769,8 @@ Script_sections::create_segments(Layout* layout)
          need_new_segment = true;
        }
       else if (is_current_seg_readonly
-              && ((*p)->flags() & elfcpp::SHF_WRITE) != 0)
+              && ((*p)->flags() & elfcpp::SHF_WRITE) != 0
+              && !parameters->options().omagic())
        {
          // Don't put a writable section in the same segment as a
          // non-writable section.
@@ -2240,58 +2819,31 @@ Script_sections::create_segments(Layout* layout)
   // efficient in any case.  We try to use the first PT_LOAD segment
   // if we can, otherwise we make a new one.
 
-  size_t segment_count = layout->segment_count();
-  size_t file_header_size;
-  size_t segment_headers_size;
-  if (parameters->get_size() == 32)
-    {
-      file_header_size = elfcpp::Elf_sizes<32>::ehdr_size;
-      segment_headers_size = segment_count * elfcpp::Elf_sizes<32>::phdr_size;
-    }
-  else if (parameters->get_size() == 64)
-    {
-      file_header_size = elfcpp::Elf_sizes<64>::ehdr_size;
-      segment_headers_size = segment_count * elfcpp::Elf_sizes<64>::phdr_size;
-    }
-  else
-    gold_unreachable();
+  if (first_seg == NULL)
+    return NULL;
+
+  size_t sizeof_headers = this->total_header_size(layout);
+
+  uint64_t vma = first_seg->vaddr();
+  uint64_t lma = first_seg->paddr();
 
-  size_t sizeof_headers = file_header_size + segment_headers_size;
+  uint64_t subtract = this->header_size_adjustment(lma, sizeof_headers);
 
-  if (first_seg != NULL
-      && (first_seg->paddr() & (abi_pagesize - 1)) >= sizeof_headers)
+  if ((lma & (abi_pagesize - 1)) >= sizeof_headers)
     {
-      first_seg->set_addresses(first_seg->vaddr() - sizeof_headers,
-                              first_seg->paddr() - sizeof_headers);
+      first_seg->set_addresses(vma - subtract, lma - subtract);
       return first_seg;
     }
 
+  // If there is no room to squeeze in the headers, then punt.  The
+  // resulting executable probably won't run on GNU/Linux, but we
+  // trust that the user knows what they are doing.
+  if (lma < subtract || vma < subtract)
+    return NULL;
+
   Output_segment* load_seg = layout->make_output_segment(elfcpp::PT_LOAD,
                                                         elfcpp::PF_R);
-  if (first_seg == NULL)
-    load_seg->set_addresses(0, 0);
-  else
-    {
-      uint64_t vma = first_seg->vaddr();
-      uint64_t lma = first_seg->paddr();
-
-      // We want a segment with the same relationship between VMA and
-      // LMA, but with enough room for the headers, and aligned to
-      // load at the start of a page.
-      uint64_t hdr_lma = lma - sizeof_headers;
-      hdr_lma &= ~(abi_pagesize - 1);
-      if (lma >= hdr_lma && vma >= (lma - hdr_lma))
-       load_seg->set_addresses(vma - (lma - hdr_lma), hdr_lma);
-      else
-       {
-         // We could handle this case by create the file header
-         // outside of any PT_LOAD segment, and creating a new
-         // PT_LOAD segment after the others to hold the segment
-         // headers.
-         gold_error(_("sections loaded on first page without room for "
-                      "file and program headers are not supported"));
-       }
-    }
+  load_seg->set_addresses(vma - subtract, lma - subtract);
 
   return load_seg;
 }
@@ -2304,6 +2856,8 @@ Script_sections::create_note_and_tls_segments(
     Layout* layout,
     const Layout::Section_list* sections)
 {
+  gold_assert(!this->saw_phdrs_clause());
+
   bool saw_tls = false;
   for (Layout::Section_list::const_iterator p = sections->begin();
        p != sections->end();
@@ -2356,12 +2910,34 @@ Script_sections::create_note_and_tls_segments(
     }
 }
 
+// Add a program header.  The PHDRS clause is syntactically distinct
+// from the SECTIONS clause, but we implement it with the SECTIONS
+// support becauase PHDRS is useless if there is no SECTIONS clause.
+
+void
+Script_sections::add_phdr(const char* name, size_t namelen, unsigned int type,
+                         bool includes_filehdr, bool includes_phdrs,
+                         bool is_flags_valid, unsigned int flags,
+                         Expression* load_address)
+{
+  if (this->phdrs_elements_ == NULL)
+    this->phdrs_elements_ = new Phdrs_elements();
+  this->phdrs_elements_->push_back(new Phdrs_element(name, namelen, type,
+                                                    includes_filehdr,
+                                                    includes_phdrs,
+                                                    is_flags_valid, flags,
+                                                    load_address));
+}
+
 // Return the number of segments we expect to create based on the
 // SECTIONS clause.  This is used to implement SIZEOF_HEADERS.
 
 size_t
 Script_sections::expected_segment_count(const Layout* layout) const
 {
+  if (this->saw_phdrs_clause())
+    return this->phdrs_elements_->size();
+
   Layout::Section_list sections;
   layout->get_allocated_sections(&sections);
 
@@ -2398,6 +2974,234 @@ Script_sections::expected_segment_count(const Layout* layout) const
   return ret;
 }
 
+// Create the segments from a PHDRS clause.  Return the segment which
+// should hold the file header and program headers, if any.
+
+Output_segment*
+Script_sections::create_segments_from_phdrs_clause(Layout* layout)
+{
+  this->attach_sections_using_phdrs_clause(layout);
+  return this->set_phdrs_clause_addresses(layout);
+}
+
+// Create the segments from the PHDRS clause, and put the output
+// sections in them.
+
+void
+Script_sections::attach_sections_using_phdrs_clause(Layout* layout)
+{
+  typedef std::map<std::string, Output_segment*> Name_to_segment;
+  Name_to_segment name_to_segment;
+  for (Phdrs_elements::const_iterator p = this->phdrs_elements_->begin();
+       p != this->phdrs_elements_->end();
+       ++p)
+    name_to_segment[(*p)->name()] = (*p)->create_segment(layout);
+
+  // Walk through the output sections and attach them to segments.
+  // Output sections in the script which do not list segments are
+  // attached to the same set of segments as the immediately preceding
+  // output section.
+  String_list* phdr_names = NULL;
+  for (Sections_elements::const_iterator p = this->sections_elements_->begin();
+       p != this->sections_elements_->end();
+       ++p)
+    {
+      bool orphan;
+      Output_section* os = (*p)->allocate_to_segment(&phdr_names, &orphan);
+      if (os == NULL)
+       continue;
+
+      if (phdr_names == NULL)
+       {
+         gold_error(_("allocated section not in any segment"));
+         continue;
+       }
+
+      // If this is an orphan section--one that was not explicitly
+      // mentioned in the linker script--then it should not inherit
+      // any segment type other than PT_LOAD.  Otherwise, e.g., the
+      // PT_INTERP segment will pick up following orphan sections,
+      // which does not make sense.  If this is not an orphan section,
+      // we trust the linker script.
+      if (orphan)
+       {
+         String_list::iterator q = phdr_names->begin();
+         while (q != phdr_names->end())
+           {
+             Name_to_segment::const_iterator r = name_to_segment.find(*q);
+             // We give errors about unknown segments below.
+             if (r == name_to_segment.end()
+                 || r->second->type() == elfcpp::PT_LOAD)
+               ++q;
+             else
+               q = phdr_names->erase(q);
+           }
+       }
+
+      bool in_load_segment = false;
+      for (String_list::const_iterator q = phdr_names->begin();
+          q != phdr_names->end();
+          ++q)
+       {
+         Name_to_segment::const_iterator r = name_to_segment.find(*q);
+         if (r == name_to_segment.end())
+           gold_error(_("no segment %s"), q->c_str());
+         else
+           {
+             elfcpp::Elf_Word seg_flags =
+               Layout::section_flags_to_segment(os->flags());
+             r->second->add_output_section(os, seg_flags);
+
+             if (r->second->type() == elfcpp::PT_LOAD)
+               {
+                 if (in_load_segment)
+                   gold_error(_("section in two PT_LOAD segments"));
+                 in_load_segment = true;
+               }
+           }
+       }
+
+      if (!in_load_segment)
+       gold_error(_("allocated section not in any PT_LOAD segment"));
+    }
+}
+
+// Set the addresses for segments created from a PHDRS clause.  Return
+// the segment which should hold the file header and program headers,
+// if any.
+
+Output_segment*
+Script_sections::set_phdrs_clause_addresses(Layout* layout)
+{
+  Output_segment* load_seg = NULL;
+  for (Phdrs_elements::const_iterator p = this->phdrs_elements_->begin();
+       p != this->phdrs_elements_->end();
+       ++p)
+    {
+      // Note that we have to set the flags after adding the output
+      // sections to the segment, as adding an output segment can
+      // change the flags.
+      (*p)->set_flags_if_valid();
+
+      Output_segment* oseg = (*p)->segment();
+
+      if (oseg->type() != elfcpp::PT_LOAD)
+       {
+         // The addresses of non-PT_LOAD segments are set from the
+         // PT_LOAD segments.
+         if ((*p)->has_load_address())
+           gold_error(_("may only specify load address for PT_LOAD segment"));
+         continue;
+       }
+
+      // The output sections should have addresses from the SECTIONS
+      // clause.  The addresses don't have to be in order, so find the
+      // one with the lowest load address.  Use that to set the
+      // address of the segment.
+
+      Output_section* osec = oseg->section_with_lowest_load_address();
+      if (osec == NULL)
+       {
+         oseg->set_addresses(0, 0);
+         continue;
+       }
+
+      uint64_t vma = osec->address();
+      uint64_t lma = osec->has_load_address() ? osec->load_address() : vma;
+
+      // Override the load address of the section with the load
+      // address specified for the segment.
+      if ((*p)->has_load_address())
+       {
+         if (osec->has_load_address())
+           gold_warning(_("PHDRS load address overrides "
+                          "section %s load address"),
+                        osec->name());
+
+         lma = (*p)->load_address();
+       }
+
+      bool headers = (*p)->includes_filehdr() && (*p)->includes_phdrs();
+      if (!headers && ((*p)->includes_filehdr() || (*p)->includes_phdrs()))
+       {
+         // We could support this if we wanted to.
+         gold_error(_("using only one of FILEHDR and PHDRS is "
+                      "not currently supported"));
+       }
+      if (headers)
+       {
+         size_t sizeof_headers = this->total_header_size(layout);
+         uint64_t subtract = this->header_size_adjustment(lma,
+                                                          sizeof_headers);
+         if (lma >= subtract && vma >= subtract)
+           {
+             lma -= subtract;
+             vma -= subtract;
+           }
+         else
+           {
+             gold_error(_("sections loaded on first page without room "
+                          "for file and program headers "
+                          "are not supported"));
+           }
+
+         if (load_seg != NULL)
+           gold_error(_("using FILEHDR and PHDRS on more than one "
+                        "PT_LOAD segment is not currently supported"));
+         load_seg = oseg;
+       }
+
+      oseg->set_addresses(vma, lma);
+    }
+
+  return load_seg;
+}
+
+// Add the file header and segment headers to non-load segments
+// specified in the PHDRS clause.
+
+void
+Script_sections::put_headers_in_phdrs(Output_data* file_header,
+                                     Output_data* segment_headers)
+{
+  gold_assert(this->saw_phdrs_clause());
+  for (Phdrs_elements::iterator p = this->phdrs_elements_->begin();
+       p != this->phdrs_elements_->end();
+       ++p)
+    {
+      if ((*p)->type() != elfcpp::PT_LOAD)
+       {
+         if ((*p)->includes_phdrs())
+           (*p)->segment()->add_initial_output_data(segment_headers);
+         if ((*p)->includes_filehdr())
+           (*p)->segment()->add_initial_output_data(file_header);
+       }
+    }
+}
+
+// Look for an output section by name and return the address, the load
+// address, the alignment, and the size.  This is used when an
+// expression refers to an output section which was not actually
+// created.  This returns true if the section was found, false
+// otherwise.
+
+bool
+Script_sections::get_output_section_info(const char* name, uint64_t* address,
+                                         uint64_t* load_address,
+                                         uint64_t* addralign,
+                                         uint64_t* size) const
+{
+  if (!this->saw_sections_clause_)
+    return false;
+  for (Sections_elements::const_iterator p = this->sections_elements_->begin();
+       p != this->sections_elements_->end();
+       ++p)
+    if ((*p)->get_output_section_info(name, address, load_address, addralign,
+                                      size))
+      return true;
+  return false;
+}
+
 // Print the SECTIONS clause to F for debugging.
 
 void
@@ -2414,6 +3218,16 @@ Script_sections::print(FILE* f) const
     (*p)->print(f);
 
   fprintf(f, "}\n");
+
+  if (this->phdrs_elements_ != NULL)
+    {
+      fprintf(f, "PHDRS {\n");
+      for (Phdrs_elements::const_iterator p = this->phdrs_elements_->begin();
+          p != this->phdrs_elements_->end();
+          ++p)
+       (*p)->print(f);
+      fprintf(f, "}\n");
+    }
 }
 
 } // End namespace gold.