svn commit: r217261 - projects/binutils-2.17/contrib/binutils/bfd

[Dimitry Andric]

Author: dim
Date: Tue Jan 11 11:01:29 2011
New Revision: 217261
URL: http://svn.freebsd.org/changeset/base/217261

Log:
  Make sure PT_NOTE sections always get the correct type (SHT_NOTE).

Modified:
  projects/binutils-2.17/contrib/binutils/bfd/elf.c

Modified: projects/binutils-2.17/contrib/binutils/bfd/elf.c
==============================================================================
--- projects/binutils-2.17/contrib/binutils/bfd/elf.c	Tue Jan 11 10:48:50 2011	(r217260)
+++ projects/binutils-2.17/contrib/binutils/bfd/elf.c	Tue Jan 11 11:01:29 2011	(r217261)
@@ -4403,7 +4403,12 @@ assign_file_positions_for_load_sections 
 
       no_contents = FALSE;
       off_adjust = 0;
-      if (p->p_type == PT_LOAD
+      if (p->p_type == PT_NOTE)
+	{
+	  for (i = 0; i < m->count; i++)
+	    elf_section_type (m->sections[i]) = SHT_NOTE;
+	}
+      else if (p->p_type == PT_LOAD
 	  && m->count > 0)
 	{
 	  bfd_size_type align;