From nobody Fri Apr 29 20:55:08 2022 X-Original-To: dev-commits-src-branches@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 108C01994C94; Fri, 29 Apr 2022 20:55:10 +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 4Kql9n44qnz3FHQ; Fri, 29 Apr 2022 20:55:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265709; 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=A7Xw1vaheZ/aUk6CBH+2WOvFxssGJcGkYmqtmFiKtvI=; b=tOGoSa+kdevY3FSfXXe3RLBWnrHihzgrD2rxpZ2ofVXh9wEu5d/68R17IiUPBKlYiLs1fT Uxubl5bwHvEwIBZymQ0hgWAYKAXONoXL/gXBLnKSHxukHwZitMaShH5D3f3F4U1K2VIQty QcxlqpMXp7SPzLOagamO94kEcnNNAURlwfiMTktmaYXGsYpqGH/MI3KbLxy3Hz+qkyR89j xt+BFnzcW8+RNHDoJmXRgqgjaqeyZa3uFvNv8U00Ka6Y16MpGHGHRct1cA7neVn746FpS+ OwTwAbJVDClxc0IJASpU/lRqD6FFwcqDb6wdnJT3xLC1YI0v8129bF+QEmq1eA== 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 09AE71428A; Fri, 29 Apr 2022 20:55:09 +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 23TKt8VB055260; Fri, 29 Apr 2022 20:55:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TKt8Qx055259; Fri, 29 Apr 2022 20:55:08 GMT (envelope-from git) Date: Fri, 29 Apr 2022 20:55:08 GMT Message-Id: <202204292055.23TKt8Qx055259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bd3afd52745a - stable/13 - mips: Rename TLS_DTP_OFFSET to TLS_DTV_OFFSET. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: bd3afd52745a373560203d7baf694f0de38b1ea2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265709; 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=A7Xw1vaheZ/aUk6CBH+2WOvFxssGJcGkYmqtmFiKtvI=; b=iGNTJYS41LJ+YF4calssilEKzlD9qQPRMBD+1WlipzSFNMbMGjqoUXfHBP7B/JljsA+xkf gqHW5Ee1gCLpFa1K/OzB+oaXUiO6dY4+IvxWOGgc0ktbwf4qhHTxTw/Rt+iKCBPUpU/SOY DZO80VNSMDzbgpGuuS9R13X/DjIgSm0yFimK3HcpB8TcnIQ5k41IRpq4+axCzG9TozS/KZ UzgLQVWkcsOyI+rF8+05zA7ypFkU0KXGJIOSdX8PEv8BM2rKY6IgmGaRON06gVc1QaMvCC nSYQ9SR/JblAnUc905ev2ZktjgP993cXyjpwqvbb5aUVndHxbVX6BppcwW6O8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651265709; a=rsa-sha256; cv=none; b=ab43qVNo09ZGDyaQoKk07YCuuL66iHor2zZyL3R7MlkjXoxSqPdM0AKfT6+7XlfXmKAjLf qEqkMMAKyezDITdG2EjW5RlhtHaBQZhDYF99C4B3dlwy7VYV3oL563GbcrEb0hJuBTNwaw jsjPXMiBZYy9ifzW7aTKio9HwhIMlimmay8++cvWN5Y40S+3v+pavCPPySI6mGyS4dhQSd fN+ow3kmVeHqm1/slrtgoQMPCwObgRj6pnB40y9azvrcRhtl3oQDwxyo0jUbA0/mi0Lbun 0idZaXykDKBg0c0efcVlolKVVi0msj06hQWqf0IHdaOS8b/t4s2yTvOS4L/xZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bd3afd52745a373560203d7baf694f0de38b1ea2 commit bd3afd52745a373560203d7baf694f0de38b1ea2 Author: John Baldwin AuthorDate: 2021-12-09 21:16:00 +0000 Commit: John Baldwin CommitDate: 2022-04-29 20:50:04 +0000 mips: Rename TLS_DTP_OFFSET to TLS_DTV_OFFSET. This is the more standard name for the bias of dtv pointers used on other platforms. This also fixes a few other places that were using the wrong bias previously on MIPS such as dlpi_tls_data in struct dl_phdr_info and the recently added __libc_tls_get_addr(). Reviewed by: kib, jrtc27 Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33346 (cherry picked from commit 03f6b141068ee7f1004ebfc76242cf951494b7d2) --- libexec/rtld-elf/mips/reloc.c | 4 ++-- libexec/rtld-elf/mips/rtld_machdep.h | 1 - sys/mips/include/tls.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libexec/rtld-elf/mips/reloc.c b/libexec/rtld-elf/mips/reloc.c index 44ecbd66a707..d870b8a1952c 100644 --- a/libexec/rtld-elf/mips/reloc.c +++ b/libexec/rtld-elf/mips/reloc.c @@ -591,7 +591,7 @@ reloc_non_plt(Obj_Entry *obj, Obj_Entry *obj_rtld, int flags, if (!defobj->tls_done && !allocate_tls_offset(obj)) return -1; - val += (Elf_Addr)def->st_value - TLS_DTP_OFFSET; + val += (Elf_Addr)def->st_value - TLS_DTV_OFFSET; store_ptr(where, val, rlen); dbg("DTPREL %s in %s %p --> %p in %s", @@ -784,7 +784,7 @@ __tls_get_addr(tls_index* ti) tls = _get_tp(); p = tls_get_addr_common(tls, ti->ti_module, ti->ti_offset + - TLS_DTP_OFFSET); + TLS_DTV_OFFSET); return (p); } diff --git a/libexec/rtld-elf/mips/rtld_machdep.h b/libexec/rtld-elf/mips/rtld_machdep.h index 0cb56290152e..eac122beaa46 100644 --- a/libexec/rtld-elf/mips/rtld_machdep.h +++ b/libexec/rtld-elf/mips/rtld_machdep.h @@ -78,6 +78,5 @@ extern void *__tls_get_addr(tls_index *ti); #define md_abi_variant_hook(x) #define TLS_VARIANT_I 1 -#define TLS_DTV_OFFSET 0 #endif diff --git a/sys/mips/include/tls.h b/sys/mips/include/tls.h index 19743d9a7883..c71507b773b0 100644 --- a/sys/mips/include/tls.h +++ b/sys/mips/include/tls.h @@ -39,7 +39,7 @@ */ #define TLS_TP_OFFSET 0x7000 -#define TLS_DTP_OFFSET 0x8000 +#define TLS_DTV_OFFSET 0x8000 #ifdef __mips_n64 #define TLS_TCB_SIZE 16