From nobody Thu Jan 27 19:02:18 2022 X-Original-To: dev-commits-src-main@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 B6B3419845C2; Thu, 27 Jan 2022 19:02:19 +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 4Jl9230Grjz4VtD; Thu, 27 Jan 2022 19:02:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643310139; 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=whMcIu5bedtMuCvkgF7nEbgGL1QvqdRn/WzRg2Ro3eU=; b=qtKmzpw07LRL1OvPnOBOz6STgAY+tx2QzSokd0/TxKouqGBmRshr4uICGkj+y02DXI2dC0 MzGuywyjS6YrM4QM2LUCrKQuL145Uvz47e+84/va4nCQfMW3Bx1G98icpQOLUO0o/5AI/Y VgaOEEKTdCuu9ciquUH2QvkTkVZVSQ0OwVt1fuFifBdHR3Yd5PYkT/uCTxRow1ch4paKV5 XhG4VDgUKKbRNnIhYiphko1TzShiVTaOkdeyMtpLTU5zVUHneEPhbbBeGuei5fELmorDMI W/o7ba2S/b0p6WaleURkQMYK8XtiwRBSVIbdix9ceFfWsz4h1g3fT3/6uO+k3A== 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 D7AB11C4D5; Thu, 27 Jan 2022 19:02:18 +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 20RJ2IGe016508; Thu, 27 Jan 2022 19:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20RJ2IEc016507; Thu, 27 Jan 2022 19:02:18 GMT (envelope-from git) Date: Thu, 27 Jan 2022 19:02:18 GMT Message-Id: <202201271902.20RJ2IEc016507@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: 6a2d75d24857 - main - rtld: Trim a few more MIPS #ifdefs. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6a2d75d248579da823999514727b64d200057092 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643310139; 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=whMcIu5bedtMuCvkgF7nEbgGL1QvqdRn/WzRg2Ro3eU=; b=iF2sSWo8MFbFLcOK6f05xG2Mg3/E1GZE0+YMIFFgOf7te4WGEgW7z7JV2dqai0H3wzNfaM 1F422mUf1PAiTXiogmjJBupg+0Mtq3SCO1FFS9XwYqNveU/PX9YNhyO2+XD+L7soY0cMfI r8gZFb89JQPy/BUbAo0sBU0iym4cM79NYb4f2a/+A9FHNaEU4Y1Ny7eBAN+/YDk7gH/BcV cubfWTX+KsgutAOk/jAn+msyedzg3O6ZxLAazSD4FZaa9F8LHIXrAL1xj9keqZpvJXe1/B kBnzyDmJ2Up3XFGc47wk3Pe+H2bh5MrYonknkkhf49bXPqE8hmM3TI6u9cikpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643310139; a=rsa-sha256; cv=none; b=eFhpg+KLSN4QBE++O0hfTt4+fjSuW/SyqJ6f2O062QcNYtR1jIkxl7MQlrop4Y4LuZKbQ4 j+qBDYLaJvbuFAzOUfkhjbFb0paiK5yrXuNAJJdnIwjxCEkgCMj0UoAHVe0U77uFzFRRto Fiiagsa9GtiC9DIlDBWkZVjfOs0MgtjwotAM5ZRFEfhecbonDROJDCPq2/DeXCizc4j7+q Fzccz0p49eMufZr8C6dXutja3DFM1QNBybtlqRxS3u2BQ16nY4deYBk95dTU3Z+y6Jo8B7 q30QlGc9QptYV/XHbQqGLvZULih0V5AULFktbScbsSOLOb49d8xUeY3NBwNR6w== 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=6a2d75d248579da823999514727b64d200057092 commit 6a2d75d248579da823999514727b64d200057092 Author: John Baldwin AuthorDate: 2022-01-27 19:00:24 +0000 Commit: John Baldwin CommitDate: 2022-01-27 19:00:24 +0000 rtld: Trim a few more MIPS #ifdefs. Reviewed by: imp, kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D34052 --- libexec/rtld-elf/rtld.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index e5ab2405a79c..f566fc97ad02 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2356,10 +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); -#if !defined(__mips__) - /* MIPS has a bogus DT_TEXTREL. */ - assert(!objtmp.textrel); -#endif + assert(objtmp.textrel == NULL); /* * Temporarily put the dynamic linker entry into the object list, so * that symbols can be found. @@ -4736,11 +4733,9 @@ matched_symbol(SymLook *req, const Obj_Entry *obj, Sym_Match_Result *result, case STT_TLS: if (symp->st_shndx != SHN_UNDEF) break; -#ifndef __mips__ else if (((req->flags & SYMLOOK_IN_PLT) == 0) && (ELF_ST_TYPE(symp->st_info) == STT_FUNC)) break; -#endif /* fallthrough */ default: return (false);