diff options
| author | Bjoern A. Zeeb <bz@FreeBSD.org> | 2009-08-30 14:38:17 +0000 |
|---|---|---|
| committer | Bjoern A. Zeeb <bz@FreeBSD.org> | 2009-08-30 14:38:17 +0000 |
| commit | ecc2fda872c83c4d497072474a7bb0b93e12db92 (patch) | |
| tree | 5dcb3648d211506c50b4c9ede361f0ea41795981 /sys/i386/i386/elf_machdep.c | |
| parent | 34903a55c3ba01f89b396e1323c2393f039479a5 (diff) | |
| download | src-ecc2fda872c83c4d497072474a7bb0b93e12db92.tar.gz src-ecc2fda872c83c4d497072474a7bb0b93e12db92.zip | |
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
Notes
Notes:
svn path=/head/; revision=196653
Diffstat (limited to 'sys/i386/i386/elf_machdep.c')
| -rw-r--r-- | sys/i386/i386/elf_machdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c index a4ff9e2160b2..abfe147769b5 100644 --- a/sys/i386/i386/elf_machdep.c +++ b/sys/i386/i386/elf_machdep.c @@ -117,7 +117,7 @@ static Elf32_Brandinfo kfreebsd_brand_info = { .sysvec = &elf32_freebsd_sysvec, .interp_newpath = NULL, .brand_note = &elf32_kfreebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE_MANDATORY }; SYSINIT(kelf32, SI_SUB_EXEC, SI_ORDER_ANY, |