From nobody Thu Jan 06 06:46:20 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 96F881932269; Thu, 6 Jan 2022 06:46:21 +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 4JTxhY0dCNz4V51; Thu, 6 Jan 2022 06:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DA4F81AD6E; Thu, 6 Jan 2022 06:46:20 +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 2066kKYr064593; Thu, 6 Jan 2022 06:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2066kKul064592; Thu, 6 Jan 2022 06:46:20 GMT (envelope-from git) Date: Thu, 6 Jan 2022 06:46:20 GMT Message-Id: <202201060646.2066kKul064592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 292cba9b4919 - main - rtld: remove mips-specific cases from generic code 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 292cba9b4919ee188ca08cc8bf5057e346514383 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641451581; 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=Cw0WXZM+U6yccw0sqWzfcubCCIlnsOwi62N9cdhSBjI=; b=GkFXuoLoHZF+GMElSWA2Q/yZ6tKBNwgvmiIEQsT1bRGc2LttcdwpqEaP8LffMa1O+Qjeek +s6G9GsmhtkWoXNrvKMxVfiuJ3NHNfMv1srj6GbKBp3JiRBM2XLkIyJdpKc52NEvk16xAQ lZfjrhbEoY7fn9cxmUkWQKNjtKlj3+jQ7jKfbXYqIGk5ScydTHwiiuGp5Wc9s87hNWllOP 9MMRWkqhUFgQQpnwFaCdYXaH4JSfMwhGuBA+7u4FObP4KDzVUAIvgAuncbuzWoAEupJ0pD qQJzQRCIDPL+HkHdJL7WBcanZFNvRzhg7lEo47yCNU5A0HYIarhYmRLSbowzYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641451581; a=rsa-sha256; cv=none; b=jX3HlVJZ5yPXQrmD5MTyQ0GDK9Ae1CHoQE8VodGTaSEqruZFqP1Ve5vDZFsv89Pvq7vZKT SijqFBMgUulZ0zS53O0eE2Sb31Q7Nrb4wgPI4sGL5l4L7a6hXzdLC73ql90n368xlONO+b pprNGxvcWoOL2LvlFTZqXn5dMbTYd7Ss6Mr2XYtglbKn+zUr1bOu6SWpqbiOA3YR1uemy1 U7fvaip2mpTVtuGcysB81JKiE9AygiiAuBYDm8uv0TwQYMLhK9HpJu5cJnfc5q53G9Dyp2 JFbxfjpW2WNDzhty2fOCUO9PM41wqNwTxCunvQm7w6mh3SayA1fAJKe5TTZWTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=292cba9b4919ee188ca08cc8bf5057e346514383 commit 292cba9b4919ee188ca08cc8bf5057e346514383 Author: Konstantin Belousov AuthorDate: 2022-01-06 00:43:51 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-06 04:00:39 +0000 rtld: remove mips-specific cases from generic code Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D33763 --- libexec/rtld-elf/rtld.c | 47 ----------------------------------------------- libexec/rtld-elf/rtld.h | 6 ------ 2 files changed, 53 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index fa0e61fe0c5c..14c4d44f50e4 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1002,10 +1002,6 @@ rtld_resolve_ifunc(const Obj_Entry *obj, const Elf_Sym *def) return ((void *)target); } -/* - * NB: MIPS uses a private version of this function (_mips_rtld_bind). - * Changes to this function should be applied there as well. - */ Elf_Addr _rtld_bind(Obj_Entry *obj, Elf_Size reloff) { @@ -1465,19 +1461,6 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath, obj->fini_array_num = dynp->d_un.d_val / sizeof(Elf_Addr); break; - /* - * Don't process DT_DEBUG on MIPS as the dynamic section - * is mapped read-only. DT_MIPS_RLD_MAP is used instead. - */ - -#ifndef __mips__ - case DT_DEBUG: - if (!early) - dbg("Filling in DT_DEBUG entry"); - (__DECONST(Elf_Dyn *, dynp))->d_un.d_ptr = (Elf_Addr)&r_debug; - break; -#endif - case DT_FLAGS: if (dynp->d_un.d_val & DF_ORIGIN) obj->z_origin = true; @@ -1490,36 +1473,6 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath, if (dynp->d_un.d_val & DF_STATIC_TLS) obj->static_tls = true; break; -#ifdef __mips__ - case DT_MIPS_LOCAL_GOTNO: - obj->local_gotno = dynp->d_un.d_val; - break; - - case DT_MIPS_SYMTABNO: - obj->symtabno = dynp->d_un.d_val; - break; - - case DT_MIPS_GOTSYM: - obj->gotsym = dynp->d_un.d_val; - break; - - case DT_MIPS_RLD_MAP: - *((Elf_Addr *)(dynp->d_un.d_ptr)) = (Elf_Addr) &r_debug; - break; - - case DT_MIPS_RLD_MAP_REL: - // The MIPS_RLD_MAP_REL tag stores the offset to the .rld_map - // section relative to the address of the tag itself. - *((Elf_Addr *)(__DECONST(char*, dynp) + dynp->d_un.d_val)) = - (Elf_Addr) &r_debug; - break; - - case DT_MIPS_PLTGOT: - obj->mips_pltgot = (Elf_Addr *)(obj->relocbase + - dynp->d_un.d_ptr); - break; - -#endif #ifdef __powerpc__ #ifdef __powerpc64__ diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 0dab41c9b7d6..cbdbd29f2aa9 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -183,12 +183,6 @@ typedef struct Struct_Obj_Entry { const Elf_Sym *symtab; /* Symbol table */ const char *strtab; /* String table */ unsigned long strsize; /* Size in bytes of string table */ -#ifdef __mips__ - Elf_Word local_gotno; /* Number of local GOT entries */ - Elf_Word symtabno; /* Number of dynamic symbols */ - Elf_Word gotsym; /* First dynamic symbol in GOT */ - Elf_Addr *mips_pltgot; /* Second PLT GOT */ -#endif #ifdef __powerpc__ #ifdef __powerpc64__ Elf_Addr glink; /* GLINK PLT call stub section */