From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 14 May 2021 01:23:55 +0000 (-0700)
Subject: libsanitizer: cherry-pick from upstream
X-Git-Tag: basepoints/gcc-13~7526
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3b1516d9dfd969d7cc1ca6f26dec13478a1c458;p=thirdparty%2Fgcc.git

libsanitizer: cherry-pick from upstream

cherry-pick:

72797dedb720 [sanitizer] Use size_t on g_tls_size to fix build on x32
---

diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp
index da19d3d2cebe..4f9577a97e2b 100644
--- a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp
+++ b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -197,7 +197,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor,
 __attribute__((unused)) static int g_use_dlpi_tls_data;
 
 #if SANITIZER_GLIBC && !SANITIZER_GO
-__attribute__((unused)) static uptr g_tls_size;
+__attribute__((unused)) static size_t g_tls_size;
 void InitTlsSize() {
   int major, minor, patch;
   g_use_dlpi_tls_data =