Date: Thu, 13 Jan 2011 21:17:59 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r217377 - projects/binutils-2.17/contrib/binutils/ld/emultempl Message-ID: <201101132117.p0DLHxSu063853@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Jan 13 21:17:59 2011 New Revision: 217377 URL: http://svn.freebsd.org/changeset/base/217377 Log: Remove temporary kludge from r217260, as the .note.ABI-tag sections in crt1.o, gcrt1.o and Scrt1.o will now have the correct type, due to the changes in r217375. 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 Thu Jan 13 21:06:30 2011 (r217376) +++ projects/binutils-2.17/contrib/binutils/ld/emultempl/elf32.em Thu Jan 13 21:17:59 2011 (r217377) @@ -1540,7 +1540,8 @@ gld${EMULATION_NAME}_place_orphan (asect if ((s->flags & SEC_ALLOC) == 0) ; else if ((s->flags & SEC_LOAD) != 0 - && CONST_STRNEQ (secname, ".note")) + && ((iself && sh_type == SHT_NOTE) + || (!iself && CONST_STRNEQ (secname, ".note")))) place = &hold[orphan_interp]; else if ((s->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0) place = &hold[orphan_bss];
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101132117.p0DLHxSu063853>