34c34
< __FBSDID("$FreeBSD: head/sys/amd64/linux32/linux32_sysvec.c 195486 2009-07-09 09:34:11Z kib $");
---
> __FBSDID("$FreeBSD: head/sys/amd64/linux32/linux32_sysvec.c 196512 2009-08-24 16:19:47Z bz $");
129a130
> static boolean_t linux32_trans_osrel(const Elf_Note *note, int32_t *osrel);
1069c1070,1071
< static char GNULINUX_ABI_VENDOR[] = "GNU";
---
> static char GNU_ABI_VENDOR[] = "GNU";
> static int GNULINUX_ABI_DESC = 0;
1070a1073,1094
> static boolean_t
> linux32_trans_osrel(const Elf_Note *note, int32_t *osrel)
> {
> const Elf32_Word *desc;
> uintptr_t p;
>
> p = (uintptr_t)(note + 1);
> p += roundup2(note->n_namesz, sizeof(Elf32_Addr));
>
> desc = (const Elf32_Word *)p;
> if (desc[0] != GNULINUX_ABI_DESC)
> return (FALSE);
>
> /*
> * For linux we encode osrel as follows (see linux_mib.c):
> * VVVMMMIII (version, major, minor), see linux_mib.c.
> */
> *osrel = desc[1] * 1000000 + desc[2] * 1000 + desc[3];
>
> return (TRUE);
> }
>
1072,1073c1096,1097
< .hdr.n_namesz = sizeof(GNULINUX_ABI_VENDOR),
< .hdr.n_descsz = 16,
---
> .hdr.n_namesz = sizeof(GNU_ABI_VENDOR),
> .hdr.n_descsz = 16, /* XXX at least 16 */
1075,1076c1099,1101
< .vendor = GNULINUX_ABI_VENDOR,
< .flags = 0
---
> .vendor = GNU_ABI_VENDOR,
> .flags = BN_TRANSLATE_OSREL,
> .trans_osrel = linux32_trans_osrel