From nobody Thu Jan 27 22:42:57 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C138019921D8; Thu, 27 Jan 2022 22:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JlFwf1s9yz3nLJ; Thu, 27 Jan 2022 22:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643323378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4k4LtV6hakIKjO+zUueiBU08Vh5u8dIW3ls5Uqh59Eg=; b=l6bJbxE47auJtddHdJmBPm1UQaNuzuBYv8WMkF3nfARHO4sXENmiOOlpyn6+WeuFIPhfcH Lo+rV1lNnNgKkHo9GNceWcWg4pEAMvjIOLjFnGNd5rozCE0D6mOdOafOdmIZtyIQIe5SOF lhKBGCQZy+dTy2MvqVaM5+Jcs3ISiCJuubpQRFSlE6CzW6KxRhuNRLkgPMXVV/FTNQeww9 GRYSPBtCiLCuBa65uWDt7LBTlT3C6YrAvfCdKaFX23PS7gRbmsXw/DN2vqi73Lco9d4zZ+ QWBPCZKk0PPKhq+5erJMn6HW+IxBU+hQncxXjIphPjscERxnOX3Nf9UozspkRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBA871EFB7; Thu, 27 Jan 2022 22:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20RMgvv0011815; Thu, 27 Jan 2022 22:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RMgvtW011814; Thu, 27 Jan 2022 22:42:57 GMT (envelope-from git) Date: Thu, 27 Jan 2022 22:42:57 GMT Message-Id: <202201272242.20RMgvtW011814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d33d8f7ef41a - main - rtld: Fix assertion I broke. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d33d8f7ef41ab4893f82a8367d6633149b48f673 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643323378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4k4LtV6hakIKjO+zUueiBU08Vh5u8dIW3ls5Uqh59Eg=; b=Sgoo8ZoNK555yCqI6MZLSTUBDhqbuKPjEzeRbwmQYcpFX9Wi3pA688Op2DT5Q6LTJPxQI/ CWgN4ZGYY4cxAP/k7fhAnJjgfaDpMFYLpzzp+woTChEbpW6akVVHAJ5APEhmngtXVlkUv+ Ec54mVT9aMflk/SWejLL4NTVNB6znmd99QOl+zyQZmmnDQgql0rz/sdju2vZWBz75m2Wu4 3GzUB5glecL4Cq8T/jpUgZeuA/Hi9wGnuReNn3aWRMT1U42HFoFN1FZsXFD6IBPjCUnTNH wlpGmFdq3adm4BjuOSBgG6Yw7ArSEY6DXmjW0UzzN1s/7PwLEVtK4DZ3AO7WnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643323378; a=rsa-sha256; cv=none; b=FizgwQeWMKuoNKhO7GiS7tUrUJEQOEvrUQJS8lAXjAdDZQUkE5EWizR4Ny56z4sTBkT9QR kcICIX5qWX4P4+Aqb0mfocjnqzysx6kLqR2VGafM64T2gjSa+roPc+kuoapYXHdaKSX1xF 2kN+RyNHDhrw4XTPviWKONvFFDU/vl0T2b21xEiUXP/OeFwdHxS7vm/Ds/zrc0AbF1OxOw bjYwTLZWTYbwk5NCxggCYSfi9QtP0jRSDB3bFW1/UjXLXbv76lek3qUQT6XJS4dRHIoU16 i/cJz5RvwFiN6cdQDn9MchXAC0vg8svaI3XScUYv57KkJs1Bj12lyOkrVclTdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d33d8f7ef41ab4893f82a8367d6633149b48f673 commit d33d8f7ef41ab4893f82a8367d6633149b48f673 Author: John Baldwin AuthorDate: 2022-01-27 22:42:40 +0000 Commit: John Baldwin 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.