bogus "ignoring changed section type" warning

[Jan Beulich]

>>> Alan Modra <amodra@bigpond.net.au> 30.08.09 07:54 >>>
>On Fri, Aug 28, 2009 at 04:06:47PM +0100, Jan Beulich wrote:
>> Like this (2.19.1 based; I'd move it to mainline and formally submit if it seems
>> right)?
>
>Yes, preapproved.

Just for the record, this is the patch I'm about to commit.

Jan

bfd/
2009-08-31  Jan Beulich  <jbeulich@novell.com>

	* elf-bfd.h (bfd_elf_get_default_section_type): Declare.
	* elf.c (bfd_elf_get_default_section_type): New.
	(elf_fake_sections): Use bfd_elf_get_default_section_type.

gas/
2009-08-31  Jan Beulich  <jbeulich@novell.com>

	* config/obj-elf.c (obj_elf_change_section): Set default type
	by calling bfd_elf_get_default_section_type.

gas/testsuite/
2009-08-31  Jan Beulich  <jbeulich@novell.com>

	* gas/elf/section5.l: Remove no longer issued warning pattern.

--- 2009-08-31/bfd/elf-bfd.h	2009-07-23 15:06:29.000000000 +0200
+++ 2009-08-31/bfd/elf-bfd.h	2009-08-31 10:07:16.000000000 +0200
@@ -2108,6 +2108,8 @@ extern bfd_boolean _bfd_elf_map_sections
 
 extern bfd_boolean _bfd_elf_is_function_type (unsigned int);
 
+extern int bfd_elf_get_default_section_type (flagword);
+
 extern Elf_Internal_Phdr * _bfd_elf_find_segment_containing_section
   (bfd * abfd, asection * section);
 
--- 2009-08-31/bfd/elf.c	2009-08-31 09:54:15.000000000 +0200
+++ 2009-08-31/bfd/elf.c	2009-08-31 10:07:16.000000000 +0200
@@ -2422,6 +2422,18 @@ _bfd_elf_init_reloc_shdr (bfd *abfd,
   return TRUE;
 }
 
+/* Return the default section type based on the passed in section flags.  */
+
+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))
+    return SHT_NOBITS;
+  return SHT_PROGBITS;
+}
+
 /* Set up an ELF internal section header for a section.  */
 
 static void
@@ -2471,12 +2483,8 @@ elf_fake_sections (bfd *abfd, asection *
      asect->flags.  */
   if ((asect->flags & SEC_GROUP) != 0)
     sh_type = SHT_GROUP;
-  else if ((asect->flags & SEC_ALLOC) != 0
-	   && (((asect->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
-	       || (asect->flags & SEC_NEVER_LOAD) != 0))
-    sh_type = SHT_NOBITS;
   else
-    sh_type = SHT_PROGBITS;
+    sh_type = bfd_elf_get_default_section_type (asect->flags);
 
   if (this_hdr->sh_type == SHT_NULL)
     this_hdr->sh_type = sh_type;
--- 2009-08-31/gas/config/obj-elf.c	2009-08-31 09:54:18.000000000 +0200
+++ 2009-08-31/gas/config/obj-elf.c	2009-08-31 10:07:16.000000000 +0200
@@ -685,6 +685,8 @@ obj_elf_change_section (const char *name
     {
       symbolS *secsym;
 
+      if (type == SHT_NULL)
+	type = bfd_elf_get_default_section_type (flags);
       elf_section_type (sec) = type;
       elf_section_flags (sec) = attr;
 
--- 2009-08-31/gas/testsuite/gas/elf/section5.l	2005-01-18 10:43:34.000000000 +0100
+++ 2009-08-31/gas/testsuite/gas/elf/section5.l	2009-08-31 10:07:16.000000000 +0200
@@ -2,7 +2,6 @@
 .*:7: Warning: .*
 .*:7: Warning: .*
 .*:10: Warning: .*
-.*:13: Warning: .*
 .*:16: Warning: .*
 .*:18: Warning: .*
 .*:20: Warning: .*