The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8409eb0251ce54b4a901b534198ca82f5048c7fe
commit 8409eb0251ce54b4a901b534198ca82f5048c7fe Author: Mark Johnston <[email protected]> AuthorDate: 2022-03-07 13:53:05 +0000 Commit: Mark Johnston <[email protected]> CommitDate: 2022-04-07 00:30:44 +0000 linker: Permit CTFv3 containers Reviewed by: Domagoj Stolfa Sponsored by: The FreeBSD Foundation (cherry picked from commit 8dbae4ce32bde42daee050ccfceee5eb2d306786) --- sys/kern/kern_ctf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c index 55e73b78c8ed..00eb6aaffb51 100644 --- a/sys/kern/kern_ctf.c +++ b/sys/kern/kern_ctf.c @@ -182,10 +182,10 @@ link_elf_ctf_get(linker_file_t lf, linker_ctf_t *lc) goto out; } - /* Check if version 2. */ - if (cth.cth_version != CTF_VERSION_2) { - printf("%s(%d): module %s CTF format version is %d " - "(2 expected)\n", + if (cth.cth_version != CTF_VERSION_2 && + cth.cth_version != CTF_VERSION_3) { + printf( + "%s(%d): module %s CTF format has unsupported version %d\n", __func__, __LINE__, lf->pathname, cth.cth_version); error = EFTYPE; goto out;
