d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extend r270123 to run the brand info's header_supported() routine for

Browse Source 
branded as well as unbranded binaries. This will be required to add
support for the new ELFv2 ABI on powerpc64, which is distinguished from
ELFv1 by the contents of the ELF header's flags field.

Reviewed by:	imp
MFC after:	2 weeks
This commit is contained in:
Nathan Whitehorn 2015-11-18 17:03:22 +00:00
parent 1300d6f134
commit 686d2f317a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/imgact_elf.c
View File

@ -286,8 +286,11 @@ __elfN(get_brandinfo)(struct image_params *imgp, const char *interp,
if (hdr->e_machine == bi->machine &&
(hdr->e_ident[EI_OSABI] == bi->brand ||
strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND],
bi->compat_3_brand, strlen(bi->compat_3_brand)) == 0))
return (bi);
bi->compat_3_brand, strlen(bi->compat_3_brand)) == 0)) {
/* Looks good, but give brand a chance to veto */
if (!bi->header_supported || bi->header_supported(imgp))
return (bi);
}
}
/* No known brand, see if the header is recognized by any brand */