remote.c/all-stop: Implement TARGET_WAITKIND_NO_RESUMED and TARGET_WNOHANG

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

diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index 4f29c08e1daddc8516722f6c39f2ac450fecb61b..3e377aa382637de16c7e9a0361e71ba632a4378f 100644 (file)
--- a/gold/script-sections.cc
+++ b/gold/script-sections.cc
@@ -1457,7 +1457,12 @@ class Input_section_info
   // Set the section name.
   void
   set_section_name(const std::string name)
-  { this->section_name_ = name; }
+  {
+    if (is_compressed_debug_section(name.c_str()))
+      this->section_name_ = corresponding_uncompressed_section_name(name);
+    else
+      this->section_name_ = name;
+  }
 
   // Return the section size.
   uint64_t
@@ -3200,7 +3205,8 @@ Script_sections::Script_sections()
     data_segment_align_start_(),
     saw_data_segment_align_(false),
     saw_relro_end_(false),
-    saw_segment_start_expression_(false)
+    saw_segment_start_expression_(false),
+    segments_created_(false)
 {
 }
 
@@ -4007,8 +4013,8 @@ Script_sections::create_note_and_tls_segments(
          saw_tls = true;
        }
 
-      // If we are making a shared library, and we see a section named
-      // .interp then put the .interp section in a PT_INTERP segment.
+      // If we see a section named .interp then put the .interp section
+      // in a PT_INTERP segment.
       // This is for GNU ld compatibility.
       if (strcmp((*p)->name(), ".interp") == 0)
        {
@@ -4019,6 +4025,8 @@ Script_sections::create_note_and_tls_segments(
          oseg->add_output_section_to_nonload(*p, seg_flags);
        }
     }
+
+    this->segments_created_ = true;
 }
 
 // Add a program header.  The PHDRS clause is syntactically distinct
@@ -4046,6 +4054,10 @@ Script_sections::add_phdr(const char* name, size_t namelen, unsigned int type,
 size_t
 Script_sections::expected_segment_count(const Layout* layout) const
 {
+  // If we've already created the segments, we won't be adding any more.
+  if (this->segments_created_)
+    return 0;
+
   if (this->saw_phdrs_clause())
     return this->phdrs_elements_->size();
 
@@ -4057,6 +4069,7 @@ Script_sections::expected_segment_count(const Layout* layout) const
 
   bool saw_note = false;
   bool saw_tls = false;
+  bool saw_interp = false;
   for (Layout::Section_list::const_iterator p = sections.begin();
        p != sections.end();
        ++p)
@@ -4080,6 +4093,15 @@ Script_sections::expected_segment_count(const Layout* layout) const
              saw_tls = true;
            }
        }
+      else if (strcmp((*p)->name(), ".interp") == 0)
+       {
+         // There can only be one PT_INTERP segment.
+         if (!saw_interp)
+           {
+             ++ret;
+             saw_interp = true;
+           }
+       }
     }
 
   return ret;
@@ -4108,6 +4130,7 @@ Script_sections::attach_sections_using_phdrs_clause(Layout* layout)
        p != this->phdrs_elements_->end();
        ++p)
     name_to_segment[(*p)->name()] = (*p)->create_segment(layout);
+  this->segments_created_ = true;
 
   // Walk through the output sections and attach them to segments.
   // Output sections in the script which do not list segments are