svn commit: r217260 - projects/binutils-2.17/contrib/binutils/ld/emultempl

[Dimitry Andric]

Author: dim
Date: Tue Jan 11 10:48:50 2011
New Revision: 217260
URL: http://svn.freebsd.org/changeset/base/217260

Log:
  Put in a temporary kludge to force ld to put .note sections just after
  .interp sections.  This seems to have been broken by binutils commit
  7f55fa5745fbe04b91e1fbd668d102f3166e03d8, but the specific reasons are
  still unclear.
  
  For now, this fix is needed to make sure .note.ABI-tag sections always
  end up in the first page of the resulting executable.

Modified:
  projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em

Modified: projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em
==============================================================================
--- projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em	Tue Jan 11 06:07:36 2011	(r217259)
+++ projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em	Tue Jan 11 10:48:50 2011	(r217260)
@@ -1540,8 +1540,7 @@ gld${EMULATION_NAME}_place_orphan (asect
   if ((s->flags & SEC_ALLOC) == 0)
     ;
   else if ((s->flags & SEC_LOAD) != 0
-	   && ((iself && sh_type == SHT_NOTE)
-	       || (!iself && CONST_STRNEQ (secname, ".note"))))
+	   && CONST_STRNEQ (secname, ".note"))
     place = &hold[orphan_interp];
   else if ((s->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
     place = &hold[orphan_bss];