From nobody Fri Apr 29 20:55:06 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 C943B19949A0; Fri, 29 Apr 2022 20:55:07 +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 4Kql9k6hlGz3FHH; Fri, 29 Apr 2022 20:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265707; 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=0nx7f0MmWT+9wYQRS5xY4YriAk7kSstAnqwK73yv6PI=; b=jphMP02dvSSA3ZRKFCcCUi6fXd04CI/EUnL1iPD2FAAD8ShVPnG+Oe/yIVqVW6F7O2rLtP rXCRAnQ1zQgdlwpmQdt9PCEVO9+MR1t34mdG6B63164Gx2HcXWF7+KxjbN3Y/JT9dydewW 4dZRBF8AGaOUdoMZkVqLjM5cdF95lepHP1KHOZPKf5EFImdCRDJp9nCpcV5kglLaRmMMKF feFfLyBoDch6ePByTS+EcVUGXAh7F785VyyOOo1ojvZFcEPHDKfAWiud9xLXIEsHUuS4wt yeBOJTGaakTB5nDRi9nEqqCxxLBs40JEvTLiS66tB/bHMn6bKrrpYY3250QvOQ== 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 BB433143C4; Fri, 29 Apr 2022 20:55:06 +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 23TKt6j0055212; Fri, 29 Apr 2022 20:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TKt6lF055211; Fri, 29 Apr 2022 20:55:06 GMT (envelope-from git) Date: Fri, 29 Apr 2022 20:55:06 GMT Message-Id: <202204292055.23TKt6lF055211@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: 6138e8498185 - stable/13 - rtld-elf: Use _get_tp in __tls_get_addr for aarch64 and riscv64. 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: 6138e8498185b0fa229b53b1de1ed6005488d57d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265707; 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=0nx7f0MmWT+9wYQRS5xY4YriAk7kSstAnqwK73yv6PI=; b=kxuF7Oq4YDUvA4p7IRLwJVr1NDoJ6b1lAfk1wOL0B23jKjwUhxHhHkIyiDiPhpyLD8VZq3 54wmHFTWLFuzFlE53c3STkjVLu5XmSeo2zxuxETZKC1rLwOFeI0C0fnQ2sTiHMT3lVxpMX 7VqmF5PmhqcMYGgZwWAWDp7TgU7h15ih/1nPlTv0qzTj+IBdCaAfxZuta0V77teIYlQoDW PMDG55QT0/qaQPQnvKzVWGjanaX2sweXmEpOk74guyYItmZmeubjKgi5xgLG6BWRqIl7M/ tF0EetB1KoFF1k8/QCopCDMnOv3obhQ2ca0EF7iwVJmbz+vgDe8JXB7Qi+p4cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651265707; a=rsa-sha256; cv=none; b=ltl1RUYoOIN5baLVGU1wusDqiI31RZrmQlCQN0x8gEZhb8bljxeGfNLvdH/+GWRUCiGMLT Q+Qo9c7pmBqAgoiAMTScpxKcZhmHtjOW8PMgYHI6Q+DJ47oYEQBN7oJpGy/YpEuN0tUIuv rZQVylQ9KbNqYmVDcpJ+XEDAhNuS6TNuYrUJ+Mc2w98QPKcTQRPkD6sSsvuOHShJcJtT3y 6TsLPvexYhwgNF4S/98+v/x6QfaAeD0nwLYrtVd5qFCNhiLLqGdfwycGNXCvKiZ01jgNp0 +4yobB2OtDKH/wwaPy97YCwpXn0os94Mr9lRlk777yFA2evCaL71qW+OzbUkiA== 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=6138e8498185b0fa229b53b1de1ed6005488d57d commit 6138e8498185b0fa229b53b1de1ed6005488d57d Author: John Baldwin AuthorDate: 2021-11-17 23:50:55 +0000 Commit: John Baldwin CommitDate: 2022-04-29 20:50:04 +0000 rtld-elf: Use _get_tp in __tls_get_addr for aarch64 and riscv64. Reviewed by: kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33047 (cherry picked from commit b928e924f74b0b8f882a9b735611421a93113640) --- libexec/rtld-elf/aarch64/reloc.c | 9 +++------ libexec/rtld-elf/riscv/reloc.c | 8 +++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/libexec/rtld-elf/aarch64/reloc.c b/libexec/rtld-elf/aarch64/reloc.c index 8cc66c87d698..f697e4a03054 100644 --- a/libexec/rtld-elf/aarch64/reloc.c +++ b/libexec/rtld-elf/aarch64/reloc.c @@ -534,11 +534,8 @@ allocate_initial_tls(Obj_Entry *objs) void * __tls_get_addr(tls_index* ti) { - char *p; - void *_tp; + Elf_Addr **dtvp; - __asm __volatile("mrs %0, tpidr_el0" : "=r" (_tp)); - p = tls_get_addr_common((Elf_Addr **)(_tp), ti->ti_module, ti->ti_offset); - - return (p); + dtvp = _get_tp(); + return (tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset)); } diff --git a/libexec/rtld-elf/riscv/reloc.c b/libexec/rtld-elf/riscv/reloc.c index 1e749206e9b9..70db8379ade5 100644 --- a/libexec/rtld-elf/riscv/reloc.c +++ b/libexec/rtld-elf/riscv/reloc.c @@ -406,13 +406,11 @@ allocate_initial_tls(Obj_Entry *objs) void * __tls_get_addr(tls_index* ti) { - char *_tp; + Elf_Addr **dtvp; void *p; - __asm __volatile("mv %0, tp" : "=r" (_tp)); - - p = tls_get_addr_common((Elf_Addr**)((Elf_Addr)_tp - TLS_TP_OFFSET - - TLS_TCB_SIZE), ti->ti_module, ti->ti_offset); + dtvp = _get_tp(); + p = tls_get_addr_common(dtvp, ti->ti_module, ti->ti_offset); return ((char*)p + TLS_DTV_OFFSET); }