public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-787] libsanitizer: cherry-pick from upstream
@ 2021-05-14  1:25 H.J. Lu
  0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2021-05-14  1:25 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:f3b1516d9dfd969d7cc1ca6f26dec13478a1c458

commit r12-787-gf3b1516d9dfd969d7cc1ca6f26dec13478a1c458
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu May 13 18:23:55 2021 -0700

    libsanitizer: cherry-pick from upstream
    
    cherry-pick:
    
    72797dedb720 [sanitizer] Use size_t on g_tls_size to fix build on x32

Diff:
---
 libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp
index da19d3d2ceb..4f9577a97e2 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 =


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2021-05-14  1:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-14  1:25 [gcc r12-787] libsanitizer: cherry-pick from upstream H.J. Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).