bfd/

	* elf.c (bfd_elf_get_default_section_type): Don't test SEC_NEVER_LOAD.
	* elflink.c (elf_link_input_bfd): Likewise.
ld/
	* ld.texinfo (NOLOAD): Do not erroneously state that contents will
	appear in output file.
	* ldlang.c (lang_add_section): Clear SEC_HAS_CONTENTS on noload
	unless SEC_COFF_SHARED_LIBRARY.
	(map_input_to_output_sections): Don't set SEC_HAS_CONTENTS for noload
	output sections.
	(lang_size_sections_1): Don't test SEC_NEVER_LOAD when deciding
	to update dot in region.  Ditto when setting SEC_ALLOC if dot
	advanced due to assignment.
	* ldwrite.c (build_link_order): Don't test SEC_NEVER_LOAD.

7 files changed, 33 insertions, 22 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f5f69258f3..e96c66eec5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-16  Alan Modra  <amodra@gmail.com>
+
+	* elf.c (bfd_elf_get_default_section_type): Don't test SEC_NEVER_LOAD.
+	* elflink.c (elf_link_input_bfd): Likewise.
+
 2010-09-15  Kai Tietz  <kai.tietz@onevision.com>
 
 	* pei-x86_64.c (pex64_get_unwind_info): Reorgnized.
diff --git a/bfd/elf.c b/bfd/elf.c
index f5dfcd63cd..5ec92e92b9 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2452,8 +2452,7 @@ int
 bfd_elf_get_default_section_type (flagword flags)
 {
   if ((flags & SEC_ALLOC) != 0
-      && ((flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0
-	  || (flags & SEC_NEVER_LOAD) != 0))
+      && (flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
     return SHT_NOBITS;
   return SHT_PROGBITS;
 }
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 1446885c9f..4351e28cfe 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -2829,7 +2829,7 @@ _bfd_elf_dynamic_symbol_p (struct elf_link_hash_entry *h,
 /* Return true if the symbol referred to by H should be considered
    to resolve local to the current module, and false otherwise.  Differs
    from (the inverse of) _bfd_elf_dynamic_symbol_p in the treatment of
-   undefined symbols.  The two functions are vitually identical except
+   undefined symbols.  The two functions are virtually identical except
    for the place where forced_local and dynindx == -1 are tested.  If
    either of those tests are true, _bfd_elf_dynamic_symbol_p will say
    the symbol is local, while _bfd_elf_symbol_refs_local_p will say
@@ -9843,7 +9843,6 @@ elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
 	  {
 	    /* FIXME: octets_per_byte.  */
 	    if (! (o->flags & SEC_EXCLUDE)
-		&& ! (o->output_section->flags & SEC_NEVER_LOAD)
 		&& ! bfd_set_section_contents (output_bfd, o->output_section,
 					       contents,
 					       (file_ptr) o->output_offset,
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4c4f888454..79d06d2de3 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-16  Alan Modra  <amodra@gmail.com>
+
+	* ld.texinfo (NOLOAD): Do not erroneously state that contents will
+	appear in output file.
+	* ldlang.c (lang_add_section): Clear SEC_HAS_CONTENTS on noload
+	unless SEC_COFF_SHARED_LIBRARY.
+	(map_input_to_output_sections): Don't set SEC_HAS_CONTENTS for noload
+	output sections.
+	(lang_size_sections_1): Don't test SEC_NEVER_LOAD when deciding
+	to update dot in region.  Ditto when setting SEC_ALLOC if dot
+	advanced due to assignment.
+	* ldwrite.c (build_link_order): Don't test SEC_NEVER_LOAD.
+
 2010-09-15  Kai Tietz  <kai.tietz@onevision.com>
 
 	* scripttempl/pep.sc: Add .xdata segment and
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
index a3d8b9a740..28c59f2a79 100644
--- a/ld/ld.texinfo
+++ b/ld/ld.texinfo
@@ -4290,8 +4290,7 @@ The linker normally sets the attributes of an output section based on
 the input sections which map into it.  You can override this by using
 the section type.  For example, in the script sample below, the
 @samp{ROM} section is addressed at memory location @samp{0} and does not
-need to be loaded when the program is run.  The contents of the
-@samp{ROM} section will appear in the linker output file as usual.
+need to be loaded when the program is run.
 @smallexample
 @group
 SECTIONS @{
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 7f44445130..75fa25c28d 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2245,6 +2245,8 @@ lang_add_section (lang_statement_list_type *ptr,
     case noload_section:
       flags &= ~SEC_LOAD;
       flags |= SEC_NEVER_LOAD;
+      if ((flags & SEC_COFF_SHARED_LIBRARY) == 0)
+	flags &= ~SEC_HAS_CONTENTS;
       break;
     }
 
@@ -3479,8 +3481,8 @@ map_input_to_output_sections
 	  /* Make sure that any sections mentioned in the expression
 	     are initialized.  */
 	  exp_init_os (s->data_statement.exp);
-	  /* The output section gets CONTENTS, and usually ALLOC and
-	     LOAD, but the latter two may be overridden by the script.  */
+	  /* The output section gets CONTENTS, ALLOC and LOAD, but
+	     these may be overridden by the script.  */
 	  flags = SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD;
 	  switch (os->sectype)
 	    {
@@ -3491,7 +3493,7 @@ map_input_to_output_sections
 	      flags = SEC_HAS_CONTENTS;
 	      break;
 	    case noload_section:
-	      flags = SEC_HAS_CONTENTS | SEC_NEVER_LOAD;
+	      flags = SEC_NEVER_LOAD;
 	      break;
 	    }
 	  if (os->bfd_section == NULL)
@@ -4979,14 +4981,9 @@ lang_size_sections_1
 	    /* Update dot in the region ?
 	       We only do this if the section is going to be allocated,
 	       since unallocated sections do not contribute to the region's
-	       overall size in memory.
-
-	       If the SEC_NEVER_LOAD bit is not set, it will affect the
-	       addresses of sections after it. We have to update
-	       dot.  */
+	       overall size in memory.  */
 	    if (os->region != NULL
-		&& ((os->bfd_section->flags & SEC_NEVER_LOAD) == 0
-		    || (os->bfd_section->flags & (SEC_ALLOC | SEC_LOAD))))
+		&& (os->bfd_section->flags & (SEC_ALLOC | SEC_LOAD)))
 	      {
 		os->region->current = dot;
 
@@ -5172,8 +5169,8 @@ lang_size_sections_1
 		    /* If dot is advanced, this implies that the section
 		       should have space allocated to it, unless the
 		       user has explicitly stated that the section
-		       should never be loaded.  */
-		    if (!(output_section_statement->flags & SEC_NEVER_LOAD))
+		       should not be allocated.  */
+		    if (output_section_statement->sectype != noalloc_section)
 		      output_section_statement->bfd_section->flags |= SEC_ALLOC;
 		  }
 		dot = newdot;
diff --git a/ld/ldwrite.c b/ld/ldwrite.c
index 7eb8b2b01d..6b8423b568 100644
--- a/ld/ldwrite.c
+++ b/ld/ldwrite.c
@@ -276,10 +276,9 @@ build_link_order (lang_statement_union_type *statement)
 	output_section = statement->padding_statement.output_section;
 	ASSERT (statement->padding_statement.output_section->owner
 		== link_info.output_bfd);
-	if (((output_section->flags & SEC_HAS_CONTENTS) != 0
-	     || ((output_section->flags & SEC_LOAD) != 0
-		 && (output_section->flags & SEC_THREAD_LOCAL)))
-	    && (output_section->flags & SEC_NEVER_LOAD) == 0)
+	if ((output_section->flags & SEC_HAS_CONTENTS) != 0
+	    || ((output_section->flags & SEC_LOAD) != 0
+		&& (output_section->flags & SEC_THREAD_LOCAL)))
 	  {
 	    link_order = bfd_new_link_order (link_info.output_bfd,
 					     output_section);