Problem setting the CONTENTS flag

[H. J. Lu]

On Fri, Apr 21, 2006 at 07:35:58AM -0700, H. J. Lu wrote:
> On Fri, Apr 21, 2006 at 01:58:08PM +0100, Andrew STUBBS wrote:
> > Hi all,
> > 
> > I have encountered an error setting the CONTENTS and LOAD flags with 
> > relatively recent versions of objcopy/bfd.
> > 
> 
> Could you please open a bug report with a simple testcase? This patch
> should work.
> 
> Thanks.
> 
> 

Here is an updated patch.


H.J.
----
2006-04-21  H.J. Lu  <hongjiu.lu@intel.com>

	PR binutils/2593
	* elf.c (_bfd_elf_new_section_hook): Don't set section ELF type
	and flags if its BFD flags has been set.
	(_bfd_elf_init_private_section_data): Don't copy the output ELF
	section type from input if it has been set to something
	different.

--- bfd/elf.c.copy	2006-04-21 07:00:02.000000000 -0700
+++ bfd/elf.c	2006-04-21 16:15:41.000000000 -0700
@@ -2487,10 +2487,11 @@ _bfd_elf_new_section_hook (bfd *abfd, as
   bed = get_elf_backend_data (abfd);
   sec->use_rela_p = bed->default_use_rela_p;
 
-  /* When we read a file, we don't need section type and flags unless
-     it is a linker created section.  They will be overridden in
-     _bfd_elf_make_section_from_shdr anyway.  */
-  if (abfd->direction != read_direction
+  /* When we read a file or section BFD flags have been set, we don't
+     need section type and flags unless it is a linker created section.
+     They will be overridden in _bfd_elf_make_section_from_shdr
+     anyway.  */
+  if ((!sec->flags && abfd->direction != read_direction)
       || (sec->flags & SEC_LINKER_CREATED) != 0)
     {
       ssect = (*bed->get_sec_type_attr) (abfd, sec);
@@ -5906,9 +5907,9 @@ _bfd_elf_init_private_section_data (bfd 
       || obfd->xvec->flavour != bfd_target_elf_flavour)
     return TRUE;
 
-  /* FIXME: What if the output ELF section type has been set to
-     something different?  */
-  if (elf_section_type (osec) == SHT_NULL)
+  /* Don't copy the output ELF section type from input if it has been
+     set to something different.  */
+  if (osec->flags == isec->flags || !osec->flags)
     elf_section_type (osec) = elf_section_type (isec);
 
   /* Set things up for objcopy and relocatable link.  The output