From owner-cvs-src-old@FreeBSD.ORG  Wed Sep  2 10:41:12 2009
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7FA3110656A5
	for <cvs-src-old@freebsd.org>; Wed,  2 Sep 2009 10:41:12 +0000 (UTC)
	(envelope-from bz@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BE738FC0C
	for <cvs-src-old@freebsd.org>; Wed,  2 Sep 2009 10:41:12 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n82AfCSc052272
	for <cvs-src-old@freebsd.org>; Wed, 2 Sep 2009 10:41:12 GMT
	(envelope-from bz@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n82AfCSt052271
	for cvs-src-old@freebsd.org; Wed, 2 Sep 2009 10:41:12 GMT
	(envelope-from bz@repoman.freebsd.org)
Message-Id: <200909021041.n82AfCSt052271@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	bz@repoman.freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 2 Sep 2009 10:39:46 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_8
Subject: cvs commit: src/sys/amd64/amd64 elf_machdep.c src/sys/compat/ia32
 ia32_sysvec.c src/sys/i386/i386 elf_machdep.c src/sys/kern
 imgact_elf.c src/sys/sys imgact_elf.h
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Sep 2009 10:41:12 -0000

bz          2009-09-02 10:39:46 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_8)
    sys/amd64/amd64      elf_machdep.c 
    sys/compat/ia32      ia32_sysvec.c 
    sys/i386/i386        elf_machdep.c 
    sys/kern             imgact_elf.c 
    sys/sys              imgact_elf.h 
  Log:
  SVN rev 196761 on 2009-09-02 10:39:46Z by bz
  
  MFC r196653:
    Make sure FreeBSD binaries without .note.ABI-tag section work
    correctly and do not match a colliding Debian GNU/kFreeBSD
    brandinfo statements.
    For this mark the Debian GNU/kFreeBSD brandinfo that it must have
    an .note.ABI-tag section and ignore the old EI_OSABI brandinfo
    when comparing a possibly colliding set of options.
  
    Due to SYSINIT we add the brandinfo in a non-deterministic order,
    so native FreeBSD is not always first. We may want to consider
    to force native FreeBSD to come first as well.
  
    The only way a problem could currently be noticed is when running an
    i386 binary without the .note.ABI-tag on amd64 and the Debian GNU/kFreeBSD
    brandinfo  was matched first,  as the fallback to ld-elf32.so.1 does
    not exist in that case.
  
  Reported and tested by: ticso
  In collaboration with:  kib
  MFC after:              3 days
  Approved by:            re (rwatson)
  
  Revision   Changes    Path
  1.30.2.3   +1 -1      src/sys/amd64/amd64/elf_machdep.c
  1.33.2.3   +1 -1      src/sys/compat/ia32/ia32_sysvec.c
  1.27.2.3   +1 -1      src/sys/i386/i386/elf_machdep.c
  1.197.2.3  +13 -5     src/sys/kern/imgact_elf.c
  1.34.2.3   +3 -2      src/sys/sys/imgact_elf.h