2006-10-26 H.J. Lu <hongjiu.lu@intel.com>

	* elf.c (_bfd_elf_init_private_section_data): Assert output
	section ELF type instead of check if it is SHT_NULL.  Copy
	OS/PROC specific flags from input section to output section.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1f8d8f090bbbf5f6bf136bb655346769d7db8cb7..1727234d50951d4f84e97e0ae4b2627e2eac573e 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf.c (_bfd_elf_init_private_section_data): Assert output
+       section ELF type instead of check if it is SHT_NULL.  Copy
+       OS/PROC specific flags from input section to output section.
+
 2006-10-27  Alan Modra  <amodra@bigpond.net.au>
 
        * section.c (SEC_KEEP): Update comment.

diff --git a/bfd/elf.c b/bfd/elf.c
index f2cf85f4c6cd06fb3eb0ceb24ef7f8658d2d8f90..24ca6df7c9e3cfef7883e933c37a30a49f8b0e86 100644 (file)
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5950,9 +5950,17 @@ _bfd_elf_init_private_section_data (bfd *ibfd,
      output BFD section flags have been set to something different.
      elf_fake_sections will set ELF section type based on BFD
      section flags.  */
-  if (osec->flags == isec->flags
-      || (osec->flags == 0 && elf_section_type (osec) == SHT_NULL))
-    elf_section_type (osec) = elf_section_type (isec);
+  if (osec->flags == isec->flags || !osec->flags)
+    {
+      BFD_ASSERT (osec->flags == isec->flags 
+                 || (!osec->flags
+                     && elf_section_type (osec) == SHT_NULL));
+      elf_section_type (osec) = elf_section_type (isec);
+    }
+
+  /* FIXME: Is this correct for all OS/PROC specific flags?  */
+  elf_section_flags (osec) |= (elf_section_flags (isec)
+                              & (SHF_MASKOS | SHF_MASKPROC));
 
   /* Set things up for objcopy and relocatable link.  The output
      SHT_GROUP section will have its elf_next_in_group pointing back