Update copyright years

[deliverable/binutils-gdb.git] / gold / script-sections.cc

diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index f90c0b3752d69054f5bd63163570fc10c55d8b50..799f4ab3536db7a65583453457260c5b0dd6686e 100644 (file)
--- a/gold/script-sections.cc
+++ b/gold/script-sections.cc
@@ -1,6 +1,6 @@
 // script-sections.cc -- linker script SECTIONS for gold
 
-// Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2008-2014 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -582,7 +582,7 @@ class Sections_element
   // Output_section_definition.
   virtual const char*
   output_section_name(const char*, const char*, Output_section***,
-                     Script_sections::Section_type*)
+                     Script_sections::Section_type*, bool*)
   { return NULL; }
 
   // Initialize OSP with an output section.
@@ -800,7 +800,7 @@ class Output_section_element
   // Return whether this element matches FILE_NAME and SECTION_NAME.
   // The only real implementation is in Output_section_element_input.
   virtual bool
-  match_name(const char*, const char*) const
+  match_name(const char*, const char*, bool *) const
   { return false; }
 
   // Set section addresses.  This includes applying assignments if the
@@ -1238,10 +1238,10 @@ class Output_section_element_input : public Output_section_element
     *dot_section = this->final_dot_section_;
   }
 
-  // See whether we match FILE_NAME and SECTION_NAME as an input
-  // section.
+  // See whether we match FILE_NAME and SECTION_NAME as an input section.
+  // If we do then also indicate whether the section should be KEPT.
   bool
-  match_name(const char* file_name, const char* section_name) const;
+  match_name(const char* file_name, const char* section_name, bool* keep) const;
 
   // Set the section address.
   void
@@ -1393,15 +1393,19 @@ Output_section_element_input::match_file_name(const char* file_name) const
   return true;
 }
 
-// See whether we match FILE_NAME and SECTION_NAME.
+// See whether we match FILE_NAME and SECTION_NAME.  If we do then
+// KEEP indicates whether the section should survive garbage collection.
 
 bool
 Output_section_element_input::match_name(const char* file_name,
-                                        const char* section_name) const
+                                        const char* section_name,
+                                        bool *keep) const
 {
   if (!this->match_file_name(file_name))
     return false;
 
+  *keep = this->keep_;
+
   // If there are no section name patterns, then we match.
   if (this->input_section_patterns_.empty())
     return true;
@@ -1861,7 +1865,8 @@ class Output_section_definition : public Sections_element
   // section name.
   const char*
   output_section_name(const char* file_name, const char* section_name,
-                     Output_section***, Script_sections::Section_type*);
+                     Output_section***, Script_sections::Section_type*,
+                     bool*);
 
   // Initialize OSP with an output section.
   void
@@ -2146,14 +2151,15 @@ Output_section_definition::output_section_name(
     const char* file_name,
     const char* section_name,
     Output_section*** slot,
-    Script_sections::Section_type* psection_type)
+    Script_sections::Section_type* psection_type,
+    bool* keep)
 {
   // Ask each element whether it matches NAME.
   for (Output_section_elements::const_iterator p = this->elements_.begin();
        p != this->elements_.end();
        ++p)
     {
-      if ((*p)->match_name(file_name, section_name))
+      if ((*p)->match_name(file_name, section_name, keep))
        {
          // We found a match for NAME, which means that it should go
          // into this output section.
@@ -2288,6 +2294,15 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
   uint64_t old_dot_value = *dot_value;
   uint64_t old_load_address = *load_address;
 
+  // If input section sorting is requested via --section-ordering-file or
+  // linker plugins, then do it here.  This is important because we want 
+  // any sorting specified in the linker scripts, which will be done after
+  // this, to take precedence.  The final order of input sections is then 
+  // guaranteed to be according to the linker script specification.
+  if (this->output_section_ != NULL
+      && this->output_section_->input_section_order_specified())
+    this->output_section_->sort_attached_input_sections();
+
   // Decide the start address for the section.  The algorithm is:
   // 1) If an address has been specified in a linker script, use that.
   // 2) Otherwise if a memory region has been specified for the section,
@@ -2859,6 +2874,15 @@ Orphan_output_section::set_section_addresses(Symbol_table*, Layout*,
   uint64_t address = *dot_value;
   address = align_address(address, this->os_->addralign());
 
+  // If input section sorting is requested via --section-ordering-file or
+  // linker plugins, then do it here.  This is important because we want 
+  // any sorting specified in the linker scripts, which will be done after
+  // this, to take precedence.  The final order of input sections is then 
+  // guaranteed to be according to the linker script specification.
+  if (this->os_ != NULL
+      && this->os_->input_section_order_specified())
+    this->os_->sort_attached_input_sections();
+
   // For a relocatable link, all orphan sections are put at
   // address 0.  In general we expect all sections to be at
   // address 0 for a relocatable link, but we permit the linker
@@ -2894,11 +2918,17 @@ Orphan_output_section::set_section_addresses(Symbol_table*, Layout*,
       address += size;
     }
 
-  // An SHF_TLS/SHT_NOBITS section does not take up any address space.
-  if (this->os_ == NULL
-      || (this->os_->flags() & elfcpp::SHF_TLS) == 0
-      || this->os_->type() != elfcpp::SHT_NOBITS)
+  if (parameters->options().relocatable())
+    {
+      // For a relocatable link, reset DOT_VALUE to 0.
+      *dot_value = 0;
+      *load_address = 0;
+    }
+  else if (this->os_ == NULL
+          || (this->os_->flags() & elfcpp::SHF_TLS) == 0
+          || this->os_->type() != elfcpp::SHT_NOBITS)
     {
+      // An SHF_TLS/SHT_NOBITS section does not take up any address space.
       if (!have_load_address)
        *load_address = address;
       else
@@ -3365,7 +3395,8 @@ Script_sections::output_section_name(
     const char* file_name,
     const char* section_name,
     Output_section*** output_section_slot,
-    Script_sections::Section_type* psection_type)
+    Script_sections::Section_type* psection_type,
+    bool* keep)
 {
   for (Sections_elements::const_iterator p = this->sections_elements_->begin();
        p != this->sections_elements_->end();
@@ -3373,7 +3404,7 @@ Script_sections::output_section_name(
     {
       const char* ret = (*p)->output_section_name(file_name, section_name,
                                                  output_section_slot,
-                                                 psection_type);
+                                                 psection_type, keep);
 
       if (ret != NULL)
        {