Extend r270123 to run the brand info's header_supported() routine for
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:
parent
1300d6f134
commit
686d2f317a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=291020
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user