git: 8dbae4ce32bd - main - linker: Permit CTFv3 containers

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=8dbae4ce32bde42daee050ccfceee5eb2d306786

commit 8dbae4ce32bde42daee050ccfceee5eb2d306786
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2022-03-07 13:53:05 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2022-03-07 15:43:19 +0000

    linker: Permit CTFv3 containers
    
    Reviewed by:    Domagoj Stolfa
    MFC after:      1 month
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D34362
---
 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 e9a4f98a98dc..aafa75eff097 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;