Date: Mon, 7 Sep 2009 13:37:04 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: cvs-src-old@freebsd.org 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 Message-ID: <200909071337.n87DbZiG064112@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
bz 2009-09-07 13:37:04 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_7)
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 196924 on 2009-09-07 13:37:04Z 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
Revision Changes Path
1.26.2.5 +1 -1 src/sys/amd64/amd64/elf_machdep.c
1.27.2.6 +1 -1 src/sys/compat/ia32/ia32_sysvec.c
1.22.2.5 +1 -1 src/sys/i386/i386/elf_machdep.c
1.178.2.9 +13 -5 src/sys/kern/imgact_elf.c
1.29.2.4 +3 -2 src/sys/sys/imgact_elf.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909071337.n87DbZiG064112>