From nobody Thu Jan 06 06:46:21 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 75E55193253A; Thu, 6 Jan 2022 06:46:23 +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 4JTxhZ2K2Gz4V2m; Thu, 6 Jan 2022 06:46:22 +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 0667F1B332; Thu, 6 Jan 2022 06:46:22 +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 2066kLUG064623; Thu, 6 Jan 2022 06:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2066kLK2064622; Thu, 6 Jan 2022 06:46:21 GMT (envelope-from git) Date: Thu, 6 Jan 2022 06:46:21 GMT Message-Id: <202201060646.2066kLK2064622@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: 470b98e61df7 - main - rtld: remove mips arch directory 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: 470b98e61df7291e5486de87168501799061dc2b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641451582; 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=BmMvNu2G4Nzjr4zjEOxEuTVErcVVqbhj09oyfLK4c6w=; b=PULBH9/ug9RBtd7mHktWcf404E57K4d9Z3oMPZf7f4oKtqLygwfDD1C57w8xKMJ9/HJ02V FDPCObROmGHT39PlOWgECl3mSJaWOnPw406m5Zg25IxWEk2CPfm7Gp3bMgpczXyxracJB8 N47y1tLDGm+/so5/tihKDtjrtqZOB3aLd5Bs/uI3I0v7rN4ckEEkh3cwVDnlEed4pUkAwa 9bAe96bLARADdES4efUSzQeAA/rO+dIEYxIb+zNR7HJylqogY8iyIvpknrJMWAWOrX5lTW 3G7zwOO8DsPUJgC96ReYkmnEIGEq8NvCUgaWfKagDvqCIiG3iB0cnwlvj84Lsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641451582; a=rsa-sha256; cv=none; b=OyUFsQak+cQoo6YWKzOeBWAz0NyhVSPNJLcQZsJmHC9kY/foMPEffgXfOK8n+3uAieB9iL gVUE84jIvCu7Z6t8J+I7DzSbnD10bliajYi5vKOpk6UpAuFBhpWYf2RzswW+s9Ol3feVYd lqABdc+Q/h63/siK0ZhfMzI+GF0nUrT+Ycq6Ib4szurxsPk5plxi3XYWdYVdq9hqiKX2FS D/9snDtZAsV+3qH2rNrn+Ovww+zFz7J6tLARUt6Ifuj5wMvOMHcNHAX0Pxz+3sGWv/Og8D SmFnpFjxnweVP2JWFNgzbiAa7BJhi5q5+4x3QFbRi2g7wTzXz9AJLyGnbGAw+A== 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=470b98e61df7291e5486de87168501799061dc2b commit 470b98e61df7291e5486de87168501799061dc2b Author: Konstantin Belousov AuthorDate: 2022-01-06 00:44:51 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-06 04:00:39 +0000 rtld: remove mips arch directory Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D33763 --- libexec/rtld-elf/mips/Makefile.inc | 3 - libexec/rtld-elf/mips/reloc.c | 786 ----------------------------------- libexec/rtld-elf/mips/rtld_machdep.h | 80 ---- libexec/rtld-elf/mips/rtld_start.S | 289 ------------- 4 files changed, 1158 deletions(-) diff --git a/libexec/rtld-elf/mips/Makefile.inc b/libexec/rtld-elf/mips/Makefile.inc deleted file mode 100644 index 491f5b1bad62..000000000000 --- a/libexec/rtld-elf/mips/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD$ - -CFLAGS.reloc.c+=-fno-jump-tables diff --git a/libexec/rtld-elf/mips/reloc.c b/libexec/rtld-elf/mips/reloc.c deleted file mode 100644 index 12bfb01ba4ad..000000000000 --- a/libexec/rtld-elf/mips/reloc.c +++ /dev/null @@ -1,786 +0,0 @@ -/* $NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $ */ - -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright 1997 Michael L. Hitch - * Portions copyright 2002 Charles M. Hannum - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include - -#include -#include -#include - -#include -#include - -#include "debug.h" -#include "rtld.h" - -#ifdef __mips_n64 -#define GOT1_MASK 0x8000000000000000UL -#else -#define GOT1_MASK 0x80000000UL -#endif - -/* - * Determine if the second GOT entry is reserved for rtld or if it is - * the first "real" GOT entry. - * - * This must be a macro rather than a function so that - * _rtld_relocate_nonplt_self doesn't trigger a GOT invocation trying - * to use it before the local GOT entries in rtld are adjusted. - */ -#ifdef __mips_n64 -/* Old binutils uses the 32-bit GOT1 mask value for N64. */ -#define GOT1_RESERVED_FOR_RTLD(got) \ - (((got)[1] == 0x80000000) || (got)[1] & GOT1_MASK) -#else -#define GOT1_RESERVED_FOR_RTLD(got) ((got)[1] & GOT1_MASK) -#endif - -#ifdef __mips_n64 -/* - * ELF64 MIPS encodes the relocs uniquely. The first 32-bits of info contain - * the symbol index. The top 32-bits contain three relocation types encoded - * in big-endian integer with first relocation in LSB. This means for little - * endian we have to byte swap that integer (r_type). - */ -#define Elf_Sxword Elf64_Sxword -#define ELF_R_NXTTYPE_64_P(r_type) ((((r_type) >> 8) & 0xff) == R_TYPE(64)) -#if BYTE_ORDER == LITTLE_ENDIAN -#undef ELF_R_SYM -#undef ELF_R_TYPE -#define ELF_R_SYM(r_info) ((r_info) & 0xffffffff) -#define ELF_R_TYPE(r_info) bswap32((r_info) >> 32) -#endif -#else -#define ELF_R_NXTTYPE_64_P(r_type) (0) -#define Elf_Sxword Elf32_Sword -#endif - -void _rtld_pltbind_start(void); - -void -init_pltgot(Obj_Entry *obj) -{ - - if (obj->pltgot != NULL) { - obj->pltgot[0] = (Elf_Addr) &_rtld_bind_start; - if (GOT1_RESERVED_FOR_RTLD(obj->pltgot)) - obj->pltgot[1] = (Elf_Addr) obj | GOT1_MASK; - } - if (obj->mips_pltgot != NULL) { - obj->mips_pltgot[0] = (Elf_Addr) &_rtld_pltbind_start; - obj->mips_pltgot[1] = (Elf_Addr) obj; - } -} - -int -do_copy_relocations(Obj_Entry *dstobj) -{ - const Obj_Entry *srcobj, *defobj; - const Elf_Rel *rellim; - const Elf_Rel *rel; - const Elf_Sym *srcsym; - const Elf_Sym *dstsym; - const void *srcaddr; - const char *name; - void *dstaddr; - SymLook req; - size_t size; - int res; - - /* - * COPY relocs are invalid outside of the main program - */ - assert(dstobj->mainprog); - - rellim = (const Elf_Rel *)((const char *)dstobj->rel + dstobj->relsize); - for (rel = dstobj->rel; rel < rellim; rel++) { - if (ELF_R_TYPE(rel->r_info) != R_MIPS_COPY) - continue; - - dstaddr = (void *)(dstobj->relocbase + rel->r_offset); - dstsym = dstobj->symtab + ELF_R_SYM(rel->r_info); - name = dstobj->strtab + dstsym->st_name; - size = dstsym->st_size; - - symlook_init(&req, name); - req.ventry = fetch_ventry(dstobj, ELF_R_SYM(rel->r_info)); - req.flags = SYMLOOK_EARLY; - - for (srcobj = globallist_next(dstobj); srcobj != NULL; - srcobj = globallist_next(srcobj)) { - res = symlook_obj(&req, srcobj); - if (res == 0) { - srcsym = req.sym_out; - defobj = req.defobj_out; - break; - } - } - if (srcobj == NULL) { - _rtld_error( -"Undefined symbol \"%s\" referenced from COPY relocation in %s", - name, dstobj->path); - return (-1); - } - - srcaddr = (const void *)(defobj->relocbase + srcsym->st_value); - memcpy(dstaddr, srcaddr, size); - } - - return (0); -} - -void _rtld_relocate_nonplt_self(Elf_Dyn *, Elf_Addr); - -/* - * It is possible for the compiler to emit relocations for unaligned data. - * We handle this situation with these inlines. - */ -static __inline Elf_Sxword -load_ptr(void *where, size_t len) -{ - Elf_Sxword val; - - if (__predict_true(((uintptr_t)where & (len - 1)) == 0)) { -#ifdef __mips_n64 - if (len == sizeof(Elf_Sxword)) - return *(Elf_Sxword *)where; -#endif - return *(Elf_Sword *)where; - } - - val = 0; -#if BYTE_ORDER == LITTLE_ENDIAN - (void)memcpy(&val, where, len); -#endif -#if BYTE_ORDER == BIG_ENDIAN - (void)memcpy((uint8_t *)((&val)+1) - len, where, len); -#endif - return (len == sizeof(Elf_Sxword)) ? val : (Elf_Sword)val; -} - -static __inline void -store_ptr(void *where, Elf_Sxword val, size_t len) -{ - if (__predict_true(((uintptr_t)where & (len - 1)) == 0)) { -#ifdef __mips_n64 - if (len == sizeof(Elf_Sxword)) { - *(Elf_Sxword *)where = val; - return; - } -#endif - *(Elf_Sword *)where = val; - return; - } -#if BYTE_ORDER == LITTLE_ENDIAN - (void)memcpy(where, &val, len); -#endif -#if BYTE_ORDER == BIG_ENDIAN - (void)memcpy(where, (const uint8_t *)((&val)+1) - len, len); -#endif -} - -void -_rtld_relocate_nonplt_self(Elf_Dyn *dynp, Elf_Addr relocbase) -{ - const Elf_Rel *rel = NULL, *rellim; - Elf_Addr relsz = 0; - const Elf_Sym *symtab = NULL, *sym; - Elf_Addr *where; - Elf_Addr *got = NULL; - Elf_Word local_gotno = 0, symtabno = 0, gotsym = 0; - size_t i; - - for (; dynp->d_tag != DT_NULL; dynp++) { - switch (dynp->d_tag) { - case DT_REL: - rel = (const Elf_Rel *)(relocbase + dynp->d_un.d_ptr); - break; - case DT_RELSZ: - relsz = dynp->d_un.d_val; - break; - case DT_SYMTAB: - symtab = (const Elf_Sym *)(relocbase + dynp->d_un.d_ptr); - break; - case DT_PLTGOT: - got = (Elf_Addr *)(relocbase + dynp->d_un.d_ptr); - break; - case DT_MIPS_LOCAL_GOTNO: - local_gotno = dynp->d_un.d_val; - break; - case DT_MIPS_SYMTABNO: - symtabno = dynp->d_un.d_val; - break; - case DT_MIPS_GOTSYM: - gotsym = dynp->d_un.d_val; - break; - } - } - - i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1; - /* Relocate the local GOT entries */ - got += i; - for (; i < local_gotno; i++) { - *got++ += relocbase; - } - - sym = symtab + gotsym; - /* Now do the global GOT entries */ - for (i = gotsym; i < symtabno; i++) { - *got = sym->st_value + relocbase; - ++sym; - ++got; - } - - rellim = (const Elf_Rel *)((const char *)rel + relsz); - for (; rel < rellim; rel++) { - Elf_Word r_symndx, r_type; - - where = (void *)(relocbase + rel->r_offset); - - r_symndx = ELF_R_SYM(rel->r_info); - r_type = ELF_R_TYPE(rel->r_info); - - switch (r_type & 0xff) { - case R_TYPE(REL32): { - const size_t rlen = - ELF_R_NXTTYPE_64_P(r_type) - ? sizeof(Elf_Sxword) - : sizeof(Elf_Sword); - Elf_Sxword old = load_ptr(where, rlen); - Elf_Sxword val = old; -#ifdef __mips_n64 - assert(r_type == R_TYPE(REL32) - || r_type == (R_TYPE(REL32)|(R_TYPE(64) << 8))); -#endif - assert(r_symndx < gotsym); - sym = symtab + r_symndx; - assert(ELF_ST_BIND(sym->st_info) == STB_LOCAL); - val += relocbase; - dbg("REL32/L(%p) %p -> %p in ", - where, (void *)old, (void *)val); - store_ptr(where, val, rlen); - break; - } - - case R_TYPE(GPREL32): - case R_TYPE(NONE): - break; - - - default: - abort(); - break; - } - } -} - -Elf_Addr -_mips_rtld_bind(Obj_Entry *obj, Elf_Size reloff) -{ - Elf_Addr *got = obj->pltgot; - const Elf_Sym *def; - const Obj_Entry *defobj; - Elf_Addr *where; - Elf_Addr target; - RtldLockState lockstate; - - rlock_acquire(rtld_bind_lock, &lockstate); - if (sigsetjmp(lockstate.env, 0) != 0) - lock_upgrade(rtld_bind_lock, &lockstate); - - where = &got[obj->local_gotno + reloff - obj->gotsym]; - def = find_symdef(reloff, obj, &defobj, SYMLOOK_IN_PLT, NULL, - &lockstate); - if (def == NULL) - rtld_die(); - - target = (Elf_Addr)(defobj->relocbase + def->st_value); - dbg("bind now/fixup at %s sym # %jd in %s --> was=%p new=%p", - obj->path, - (intmax_t)reloff, defobj->strtab + def->st_name, - (void *)*where, (void *)target); - if (!ld_bind_not) - *where = target; - lock_release(rtld_bind_lock, &lockstate); - return (Elf_Addr)target; -} - -int -reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags, - RtldLockState *lockstate) -{ - const Elf_Rel *rel; - const Elf_Rel *rellim; - Elf_Addr *got = obj->pltgot; - const Elf_Sym *sym, *def; - const Obj_Entry *defobj; - Elf_Word i; -#ifdef SUPPORT_OLD_BROKEN_LD - int broken; -#endif - - /* The relocation for the dynamic loader has already been done. */ - if (obj == obj_rtld) - return (0); - - if ((flags & SYMLOOK_IFUNC) != 0) - /* XXX not implemented */ - return (0); - -#ifdef SUPPORT_OLD_BROKEN_LD - broken = 0; - sym = obj->symtab; - for (i = 1; i < 12; i++) - if (sym[i].st_info == ELF_ST_INFO(STB_LOCAL, STT_NOTYPE)) - broken = 1; - dbg("%s: broken=%d", obj->path, broken); -#endif - - i = GOT1_RESERVED_FOR_RTLD(got) ? 2 : 1; - - /* Relocate the local GOT entries */ - got += i; - dbg("got:%p for %d entries adding %p", - got, obj->local_gotno, obj->relocbase); - for (; i < obj->local_gotno; i++) { - *got += (Elf_Addr)obj->relocbase; - got++; - } - sym = obj->symtab + obj->gotsym; - - dbg("got:%p for %d entries", - got, obj->symtabno); - /* Now do the global GOT entries */ - for (i = obj->gotsym; i < obj->symtabno; i++) { - dbg(" doing got %d sym %p (%s, %lx)", i - obj->gotsym, sym, - sym->st_name + obj->strtab, (u_long) *got); - -#ifdef SUPPORT_OLD_BROKEN_LD - if (ELF_ST_TYPE(sym->st_info) == STT_FUNC && - broken && sym->st_shndx == SHN_UNDEF) { - /* - * XXX DANGER WILL ROBINSON! - * You might think this is stupid, as it intentionally - * defeats lazy binding -- and you'd be right. - * Unfortunately, for lazy binding to work right, we - * need to a way to force the GOT slots used for - * function pointers to be resolved immediately. This - * is supposed to be done automatically by the linker, - * by not outputting a PLT slot and setting st_value - * to 0 if there are non-PLT references, but older - * versions of GNU ld do not do this. - */ - def = find_symdef(i, obj, &defobj, flags, NULL, - lockstate); - if (def == NULL) - return -1; - *got = def->st_value + (Elf_Addr)defobj->relocbase; - } else -#endif - if (ELF_ST_TYPE(sym->st_info) == STT_FUNC && - sym->st_value != 0 && sym->st_shndx == SHN_UNDEF) { - /* - * If there are non-PLT references to the function, - * st_value should be 0, forcing us to resolve the - * address immediately. - * - * XXX DANGER WILL ROBINSON! - * The linker is not outputting PLT slots for calls to - * functions that are defined in the same shared - * library. This is a bug, because it can screw up - * link ordering rules if the symbol is defined in - * more than one module. For now, if there is a - * definition, we fail the test above and force a full - * symbol lookup. This means that all intra-module - * calls are bound immediately. - mycroft, 2003/09/24 - */ - *got = sym->st_value + (Elf_Addr)obj->relocbase; - if ((Elf_Addr)(*got) == (Elf_Addr)obj->relocbase) { - dbg("Warning2, i:%d maps to relocbase address:%p", - i, obj->relocbase); - } - - } else if (sym->st_info == ELF_ST_INFO(STB_GLOBAL, STT_SECTION)) { - /* Symbols with index SHN_ABS are not relocated. */ - if (sym->st_shndx != SHN_ABS) { - *got = sym->st_value + - (Elf_Addr)obj->relocbase; - if ((Elf_Addr)(*got) == (Elf_Addr)obj->relocbase) { - dbg("Warning3, i:%d maps to relocbase address:%p", - i, obj->relocbase); - } - } - } else { - /* TODO: add cache here */ - def = find_symdef(i, obj, &defobj, flags, NULL, - lockstate); - if (def == NULL) { - dbg("Warning4, can't find symbole %d", i); - return -1; - } - *got = def->st_value + (Elf_Addr)defobj->relocbase; - if ((Elf_Addr)(*got) == (Elf_Addr)obj->relocbase) { - dbg("Warning4, i:%d maps to relocbase address:%p", - i, obj->relocbase); - dbg("via first obj symbol %s", - obj->strtab + obj->symtab[i].st_name); - dbg("found in obj %p:%s", - defobj, defobj->path); - } - } - - dbg(" --> now %lx", (u_long) *got); - ++sym; - ++got; - } - - got = obj->pltgot; - rellim = (const Elf_Rel *)((const char *)obj->rel + obj->relsize); - for (rel = obj->rel; rel < rellim; rel++) { - Elf_Word r_symndx, r_type; - void *where; - - where = obj->relocbase + rel->r_offset; - r_symndx = ELF_R_SYM(rel->r_info); - r_type = ELF_R_TYPE(rel->r_info); - - switch (r_type & 0xff) { - case R_TYPE(NONE): - break; - - case R_TYPE(REL32): { - /* 32-bit PC-relative reference */ - const size_t rlen = - ELF_R_NXTTYPE_64_P(r_type) - ? sizeof(Elf_Sxword) - : sizeof(Elf_Sword); - Elf_Sxword old = load_ptr(where, rlen); - Elf_Sxword val = old; - - def = obj->symtab + r_symndx; - - if (r_symndx >= obj->gotsym) { - val += got[obj->local_gotno + r_symndx - obj->gotsym]; - dbg("REL32/G(%p) %p --> %p (%s) in %s", - where, (void *)old, (void *)val, - obj->strtab + def->st_name, - obj->path); - } else { - /* - * XXX: ABI DIFFERENCE! - * - * Old NetBSD binutils would generate shared - * libs with section-relative relocations being - * already adjusted for the start address of - * the section. - * - * New binutils, OTOH, generate shared libs - * with the same relocations being based at - * zero, so we need to add in the start address - * of the section. - * - * --rkb, Oct 6, 2001 - */ - - if (def->st_info == - ELF_ST_INFO(STB_LOCAL, STT_SECTION) -#ifdef SUPPORT_OLD_BROKEN_LD - && !broken -#endif - ) - val += (Elf_Addr)def->st_value; - - val += (Elf_Addr)obj->relocbase; - - dbg("REL32/L(%p) %p -> %p (%s) in %s", - where, (void *)old, (void *)val, - obj->strtab + def->st_name, obj->path); - } - store_ptr(where, val, rlen); - break; - } - - case R_TYPE(COPY): - /* - * These are deferred until all other relocations have - * been done. All we do here is make sure that the - * COPY relocation is not in a shared library. They - * are allowed only in executable files. - */ - if (!obj->mainprog) { - _rtld_error("%s: Unexpected R_MIPS_COPY " - "relocation in shared library", obj->path); - return (-1); - } - break; - -#ifdef __mips_n64 - case R_TYPE(TLS_DTPMOD64): -#else - case R_TYPE(TLS_DTPMOD32): -#endif - { - - const size_t rlen = sizeof(Elf_Addr); - Elf_Addr old = load_ptr(where, rlen); - Elf_Addr val = old; - - def = find_symdef(r_symndx, obj, &defobj, flags, NULL, - lockstate); - if (def == NULL) - return -1; - - val += (Elf_Addr)defobj->tlsindex; - - store_ptr(where, val, rlen); - dbg("DTPMOD %s in %s %p --> %p in %s", - obj->strtab + obj->symtab[r_symndx].st_name, - obj->path, (void *)old, (void*)val, defobj->path); - break; - } - -#ifdef __mips_n64 - case R_TYPE(TLS_DTPREL64): -#else - case R_TYPE(TLS_DTPREL32): -#endif - { - const size_t rlen = sizeof(Elf_Addr); - Elf_Addr old = load_ptr(where, rlen); - Elf_Addr val = old; - - def = find_symdef(r_symndx, obj, &defobj, flags, NULL, - lockstate); - if (def == NULL) - return -1; - - if (!defobj->tls_done && !allocate_tls_offset(obj)) - return -1; - - val += (Elf_Addr)def->st_value - TLS_DTV_OFFSET; - store_ptr(where, val, rlen); - - dbg("DTPREL %s in %s %p --> %p in %s", - obj->strtab + obj->symtab[r_symndx].st_name, - obj->path, (void*)old, (void *)val, defobj->path); - break; - } - -#ifdef __mips_n64 - case R_TYPE(TLS_TPREL64): -#else - case R_TYPE(TLS_TPREL32): -#endif - { - const size_t rlen = sizeof(Elf_Addr); - Elf_Addr old = load_ptr(where, rlen); - Elf_Addr val = old; - - def = find_symdef(r_symndx, obj, &defobj, flags, NULL, - lockstate); - - if (def == NULL) - return -1; - - if (!defobj->tls_done && !allocate_tls_offset(obj)) - return -1; - - val += (Elf_Addr)(def->st_value + defobj->tlsoffset - - TLS_TP_OFFSET - TLS_TCB_SIZE); - store_ptr(where, val, rlen); - - dbg("TPREL %s in %s %p --> %p in %s", - obj->strtab + obj->symtab[r_symndx].st_name, - obj->path, (void*)old, (void *)val, defobj->path); - break; - } - - - - default: - dbg("sym = %lu, type = %lu, offset = %p, " - "contents = %p, symbol = %s", - (u_long)r_symndx, (u_long)ELF_R_TYPE(rel->r_info), - (void *)rel->r_offset, - (void *)load_ptr(where, sizeof(Elf_Sword)), - obj->strtab + obj->symtab[r_symndx].st_name); - _rtld_error("%s: Unsupported relocation type %ld " - "in non-PLT relocations", - obj->path, (u_long) ELF_R_TYPE(rel->r_info)); - return -1; - } - } - - return 0; -} - -/* - * Process the PLT relocations. - */ -int -reloc_plt(Obj_Entry *obj, int flags __unused, RtldLockState *lockstate __unused) -{ - const Elf_Rel *rellim; - const Elf_Rel *rel; - - rellim = (const Elf_Rel *)((const char *)obj->pltrel + obj->pltrelsize); - for (rel = obj->pltrel; rel < rellim; rel++) { - Elf_Addr *where; - - switch (ELF_R_TYPE(rel->r_info)) { - case R_MIPS_JUMP_SLOT: - where = (Elf_Addr *)(obj->relocbase + rel->r_offset); - *where += (Elf_Addr )obj->relocbase; - break; - default: - _rtld_error("Unknown relocation type %u in PLT", - (unsigned int)ELF_R_TYPE(rel->r_info)); - return (-1); - } - } - - return (0); -} - -/* - * LD_BIND_NOW was set - force relocation for all jump slots - */ -int -reloc_jmpslots(Obj_Entry *obj, int flags, RtldLockState *lockstate) -{ - const Obj_Entry *defobj; - const Elf_Rel *rellim; - const Elf_Rel *rel; - const Elf_Sym *def; - - rellim = (const Elf_Rel *)((const char *)obj->pltrel + obj->pltrelsize); - for (rel = obj->pltrel; rel < rellim; rel++) { - Elf_Addr *where; - - switch (ELF_R_TYPE(rel->r_info)) { - case R_MIPS_JUMP_SLOT: - def = find_symdef(ELF_R_SYM(rel->r_info), obj, - &defobj, SYMLOOK_IN_PLT | flags, NULL, lockstate); - if (def == NULL) { - dbg("reloc_jmpslots: sym not found"); - return (-1); - } - - where = (Elf_Addr *)(obj->relocbase + rel->r_offset); - *where = (Elf_Addr)(defobj->relocbase + def->st_value); - break; - default: - _rtld_error("Unknown relocation type %u in PLT", - (unsigned int)ELF_R_TYPE(rel->r_info)); - return (-1); - } - } - - return (0); -} - -int -reloc_iresolve(Obj_Entry *obj __unused, - struct Struct_RtldLockState *lockstate __unused) -{ - - /* XXX not implemented */ - return (0); -} - -int -reloc_iresolve_nonplt(Obj_Entry *obj __unused, - struct Struct_RtldLockState *lockstate __unused) -{ - - /* XXX not implemented */ - return (0); -} - -int -reloc_gnu_ifunc(Obj_Entry *obj __unused, int flags __unused, - struct Struct_RtldLockState *lockstate __unused) -{ - - /* XXX not implemented */ - return (0); -} - -Elf_Addr -reloc_jmpslot(Elf_Addr *where, Elf_Addr target, - const Obj_Entry *defobj __unused, const Obj_Entry *obj __unused, - const Elf_Rel *rel) -{ - - assert(ELF_R_TYPE(rel->r_info) == R_MIPS_JUMP_SLOT); - - if (*where != target && !ld_bind_not) - *where = target; - return (target); -} - -void -ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) -{ - -} - -void -allocate_initial_tls(Obj_Entry *objs) -{ - - /* - * Fix the size of the static TLS block by using the maximum - * offset allocated so far and adding a bit for dynamic modules to - * use. - */ - tls_static_space = tls_last_offset + tls_last_size + RTLD_STATIC_TLS_EXTRA; - - _tcb_set(allocate_tls(objs, NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN)); -} - -void * -__tls_get_addr(tls_index* ti) -{ - uintptr_t **dtvp; - char *p; - - dtvp = &_tcb_get()->tcb_dtv; - p = tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset); - - return (p + TLS_DTV_OFFSET); -} diff --git a/libexec/rtld-elf/mips/rtld_machdep.h b/libexec/rtld-elf/mips/rtld_machdep.h deleted file mode 100644 index 2826a56f34c1..000000000000 --- a/libexec/rtld-elf/mips/rtld_machdep.h +++ /dev/null @@ -1,80 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 1999, 2000 John D. Polstra. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef RTLD_MACHDEP_H -#define RTLD_MACHDEP_H 1 - -#include -#include -#include - -struct Struct_Obj_Entry; - -/* Return the address of the .dynamic section in the dynamic linker. */ -#define rtld_dynamic(obj) (&_DYNAMIC) - -Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, - const struct Struct_Obj_Entry *defobj, const struct Struct_Obj_Entry *obj, - const Elf_Rel *rel); -Elf_Addr _mips_rtld_bind(struct Struct_Obj_Entry *obj, Elf_Size reloff); - -#define make_function_pointer(def, defobj) \ - ((defobj)->relocbase + (def)->st_value) - -#define call_initfini_pointer(obj, target) \ - (((InitFunc)(target))()) - -#define call_init_pointer(obj, target) \ - (((InitArrFunc)(target))(main_argc, main_argv, environ)) - -#define call_ifunc_resolver(ptr) \ - (((Elf_Addr (*)(void))ptr)()) - -typedef struct { - unsigned long ti_module; - unsigned long ti_offset; -} tls_index; - -#define round(size, align) \ - (((size) + (align) - 1) & ~((align) - 1)) -#define calculate_first_tls_offset(size, align, offset) \ - TLS_TCB_SIZE -#define calculate_tls_offset(prev_offset, prev_size, size, align, offset) \ - round(prev_offset + prev_size, align) -#define calculate_tls_post_size(align) 0 - -extern void *__tls_get_addr(tls_index *ti); - -#define RTLD_DEFAULT_STACK_PF_EXEC PF_X -#define RTLD_DEFAULT_STACK_EXEC PROT_EXEC - -#define md_abi_variant_hook(x) - -#endif diff --git a/libexec/rtld-elf/mips/rtld_start.S b/libexec/rtld-elf/mips/rtld_start.S deleted file mode 100644 index 242887e3cbb7..000000000000 --- a/libexec/rtld-elf/mips/rtld_start.S +++ /dev/null @@ -1,289 +0,0 @@ -/* $NetBSD: rtld_start.S,v 1.10 2009/12/14 00:41:19 matt Exp $ */ - -/* - * Copyright 1997 Michael L. Hitch - * Portions copyright 2002 Charles M. Hannum - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include - -#if defined(__clang__) || (defined(__GNUC__) && __GNUC__ > 4) - .cfi_sections .debug_frame -#endif - -.globl _C_LABEL(_rtld_relocate_nonplt_self) -.globl _C_LABEL(_rtld) - -#define PTR_SIZE (1< 1*PTR_SIZE(sp) for atexit */ - /* -> 2*PTR_SIZE(sp) for obj_main */ - move s0, a0 /* save stack pointer from a0 */ - move s3, a3 /* save ps_strings pointer */ - - PTR_LA a1, 1f - bal 1f - PTR_LA t0, _C_LABEL(_rtld_relocate_nonplt_self) -1: PTR_SUBU a1, ra, a1 /* relocbase */ - PTR_LA a0, _DYNAMIC - PTR_ADDU t9, a1, t0 - jalr t9 /* _rtld_relocate_nonplt_self(dynp, relocabase) */ - PTR_ADDU a0, a1, a0 /* &_DYNAMIC */ - - move a0, s0 /* sp */ - PTR_ADDU a1, sp, 2*PTR_SIZE /* &our atexit function */ *** 217 LINES SKIPPED ***