From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1039) id 5E5B8385737E; Thu, 5 May 2022 21:02:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5E5B8385737E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: H.J. Lu To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-145] libsanitizer: cherry-pick commit b226894d475b from upstream X-Act-Checkin: gcc X-Git-Author: H.J. Lu X-Git-Refname: refs/heads/master X-Git-Oldrev: b6b66006787b0991e94f15c7b5c56403f1eb85fb X-Git-Newrev: a48be2e513d9ddb2fa8800a158f18502a0923aec Message-Id: <20220505210226.5E5B8385737E@sourceware.org> Date: Thu, 5 May 2022 21:02:26 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2022 21:02:26 -0000 https://gcc.gnu.org/g:a48be2e513d9ddb2fa8800a158f18502a0923aec commit r13-145-ga48be2e513d9ddb2fa8800a158f18502a0923aec Author: H.J. Lu Date: Thu May 5 13:59:16 2022 -0700 libsanitizer: cherry-pick commit b226894d475b from upstream cherry-pick: b226894d475b [sanitizer] [sanitizer] Correct GetTls for x32 Diff: --- libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp index d966d857a76..620267cdd02 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp +++ b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp @@ -462,7 +462,11 @@ static void GetTls(uptr *addr, uptr *size) { #elif SANITIZER_GLIBC && defined(__x86_64__) // For aarch64 and x86-64, use an O(1) approach which requires relatively // precise ThreadDescriptorSize. g_tls_size was initialized in InitTlsSize. +# if SANITIZER_X32 + asm("mov %%fs:8,%0" : "=r"(*addr)); +# else asm("mov %%fs:16,%0" : "=r"(*addr)); +# endif *size = g_tls_size; *addr -= *size; *addr += ThreadDescriptorSize();