diff options
| author | bz <bz@FreeBSD.org> | 2009-08-24 16:19:47 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2009-08-24 16:19:47 +0000 |
| commit | ba7b3afabc9c18fbc00ee2b3a04d75cc7bf6f923 (patch) | |
| tree | b21e68a77cf9b8fa18e8b538ce504aa2bd73af12 /sys/compat/ia32 | |
| parent | ad8cfd197776d149ee819a30b8733efd86079774 (diff) | |
| download | FreeBSD-src-ba7b3afabc9c18fbc00ee2b3a04d75cc7bf6f923.zip FreeBSD-src-ba7b3afabc9c18fbc00ee2b3a04d75cc7bf6f923.tar.gz | |
Fix handling of .note.ABI-tag section for GNU systems [1].
Handle GNU/Linux according to LSB Core Specification 4.0,
Chapter 11. Object Format, 11.8. ABI note tag.
Also check the first word of desc, not only name, according to
glibc abi-tags specification to distinguish between Linux and
kFreeBSD.
Add explicit handling for Debian GNU/kFreeBSD, which runs
on our kernels as well [2].
In {amd64,i386}/trap.c, when checking osrel of the current process,
also check the ABI to not change the signal behaviour for Linux
binary processes, now that we save an osrel version for all three
from the lists above in struct proc [2].
These changes make it possible to run FreeBSD, Debian GNU/kFreeBSD
and Linux binaries on the same machine again for at least i386 and
amd64, and no longer break kFreeBSD which was detected as GNU(/Linux).
PR: kern/135468
Submitted by: dchagin [1] (initial patch)
Suggested by: kib [2]
Tested by: Petr Salinger (Petr.Salinger seznam.cz) for kFreeBSD
Reviewed by: kib
MFC after: 3 days
Diffstat (limited to 'sys/compat/ia32')
| -rw-r--r-- | sys/compat/ia32/ia32_sysvec.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c index af8168e..5c2c571 100644 --- a/sys/compat/ia32/ia32_sysvec.c +++ b/sys/compat/ia32/ia32_sysvec.c @@ -172,6 +172,21 @@ SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY, (sysinit_cfunc_t) elf32_insert_brand_entry, &ia32_brand_oinfo); +static Elf32_Brandinfo kia32_brand_info = { + .brand = ELFOSABI_FREEBSD, + .machine = EM_386, + .compat_3_brand = "FreeBSD", + .emul_path = NULL, + .interp_path = "/lib/ld.so.1", + .sysvec = &ia32_freebsd_sysvec, + .brand_note = &elf32_kfreebsd_brandnote, + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE +}; + +SYSINIT(kia32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &kia32_brand_info); + void elf32_dump_thread(struct thread *td __unused, void *dst __unused, |
