From nobody Fri Apr 29 20:55:11 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 EF54B1994CF1; Fri, 29 Apr 2022 20:55:11 +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 4Kql9q4Rhmz3F0l; Fri, 29 Apr 2022 20:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265711; 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=xU3prxiGdt28pidaj2CA2R36Tt/83bEBxNDEUOwucsQ=; b=SzHx1/pHAHJeiQ1nUSUiqF6iBuzL4xGoE1tYaI+fD7Eh473UHY1g2fWm0vsyBDxVcjSd8B 5PjynZny++otVGuaufeTEHjzd3H030nD5rXe8rWNjNVEGFJWig4A3sdz1GqEYwIIAdnmTl P5Fg0AWK+YsphZc6Yg4xiu+IxRLiP+Xgcycj7o7Mcxe02WDciVozE5vBqG7WqIu26I0yRZ Khqw8jwrunoxSSuztfhjsqUoMfuw/V0tVQ4LSB3YNWmOmP7Y3rpdxI2/rX/ESWglD+axla exJ32LlojrR+ljqE8uFQ1VHgwJpA8HeTgNror+2VM2HDhNNRqQTNOzcae6QOKw== 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 606E81428B; Fri, 29 Apr 2022 20:55:11 +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 23TKtBf5055314; Fri, 29 Apr 2022 20:55:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TKtB7H055313; Fri, 29 Apr 2022 20:55:11 GMT (envelope-from git) Date: Fri, 29 Apr 2022 20:55:11 GMT Message-Id: <202204292055.23TKtB7H055313@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: 5c1667e8be86 - stable/13 - mips _libc_get_static_tls_base: Narrow scope of #ifdef. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5c1667e8be86e9ca7d3111b67ca19abcace634a2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651265711; 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=xU3prxiGdt28pidaj2CA2R36Tt/83bEBxNDEUOwucsQ=; b=RiSCXD02UBYtSNklRwGFEx3dfU8V/RpDGxeya7b/p79faqRBOkqU0RqBGIUPkZJ5UbLNPT RfkKTqCjD3vNV8Y7zq0KB0J5XtKkmuNuMYHcAJzVrzoyG++OHWpTUuBUypJNJyMu7YAwE5 5b/oc/0/0h4eDzt0RA5RqdrZjcq6lgrhoNWomRlFSqmVkJrSaS6PuZYhOUIaAPX+5DdNCr SFkntqqnQgqQ0CrZbfGRmvcoiVbIVLleyfdAOLxMd5tk/MsPOsp+C00rmDNWu7wWOgmfKP novNdpkAgXaKZtT6pm8aaOlSykxNI5cdQKTPtLxVW6bDlo/MGEccUuvhzRkulA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651265711; a=rsa-sha256; cv=none; b=Zl5ErlNHnMxwAK499oWTiz0tqFvJIr+VQeLOAk9S5qD3J+Vo4ic5VfkXL34jduYavv7XXU 7o2kicPYD8LndfGatXmcafG0Mgdl/gcKN7NXMMRFTkCg+JGm5FbnGG1Rx6mf6dfUz76FqF WNPt4SHmu7TjROqNAbgTy1QkdbXR2x81/pQy+pdUqXNJiTcP4CjmfNmxtWRFUmDjuQKhkh RseooBfKtopHlfQxf53Vu+rKODKMLAeOE4qDWPXxWWN+JifYtQgTJwI9aMmpH6q89PBOYS YwwbVprBPsvARzAaw1rSnV5xYS2zQ0UIvwHsB8ntW3aJjo5J4CCff5yQpM1TDg== 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=5c1667e8be86e9ca7d3111b67ca19abcace634a2 commit 5c1667e8be86e9ca7d3111b67ca19abcace634a2 Author: John Baldwin AuthorDate: 2021-12-09 21:16:34 +0000 Commit: John Baldwin CommitDate: 2022-04-29 20:50:05 +0000 mips _libc_get_static_tls_base: Narrow scope of #ifdef. Reviewed by: kib, emaste, jrtc27 Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33348 (cherry picked from commit 9952b82b398968a243909ee3854b1968c3cc8c12) --- lib/libc/mips/static_tls.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/libc/mips/static_tls.h b/lib/libc/mips/static_tls.h index 67ee8afe14c6..b823a34eaf8b 100644 --- a/lib/libc/mips/static_tls.h +++ b/lib/libc/mips/static_tls.h @@ -40,23 +40,17 @@ _libc_get_static_tls_base(size_t offset) { uintptr_t tlsbase; -#if defined(__mips_n64) __asm__ __volatile__ ( ".set\tpush\n\t" +#if defined(__mips_n64) ".set\tmips64r2\n\t" - "rdhwr\t%0, $29\n\t" - ".set\tpop" - : "=r" (tlsbase)); - tlsbase -= TLS_TP_OFFSET + TLS_TCB_SIZE; #else /* mips 32 */ - __asm__ __volatile__ ( - ".set\tpush\n\t" ".set\tmips32r2\n\t" +#endif /* ! __mips_n64 */ "rdhwr\t%0, $29\n\t" ".set\tpop" : "=r" (tlsbase)); tlsbase -= TLS_TP_OFFSET + TLS_TCB_SIZE; -#endif /* ! __mips_n64 */ tlsbase += offset; return (tlsbase); }