Date: Thu, 27 Jan 2022 22:42:57 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d33d8f7ef41a - main - rtld: Fix assertion I broke. Message-ID: <202201272242.20RMgvtW011814@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d33d8f7ef41ab4893f82a8367d6633149b48f673 commit d33d8f7ef41ab4893f82a8367d6633149b48f673 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-01-27 22:42:40 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-01-27 22:42:40 +0000 rtld: Fix assertion I broke. textrel is a bool, not a pointer. Pointy hat to: jhb Reported by: kevans Fixes: 6a2d75d24857 rtld: Trim a few more MIPS #ifdefs. --- libexec/rtld-elf/rtld.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index f566fc97ad02..4327b598db58 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2356,7 +2356,7 @@ init_rtld(caddr_t mapbase, Elf_Auxinfo **aux_info) objtmp.dynamic = rtld_dynamic(&objtmp); digest_dynamic1(&objtmp, 1, &dyn_rpath, &dyn_soname, &dyn_runpath); assert(objtmp.needed == NULL); - assert(objtmp.textrel == NULL); + assert(!objtmp.textrel); /* * Temporarily put the dynamic linker entry into the object list, so * that symbols can be found.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201272242.20RMgvtW011814>