diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2021-05-13 18:23:55 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2021-05-13 18:23:55 -0700 |
| commit | f3b1516d9dfd969d7cc1ca6f26dec13478a1c458 (patch) | |
| tree | e5c3c8afaa80a271bf78e814f479982afe449f3a /libsanitizer | |
| parent | 149061188c7c6ddf27663c8c00b7574fc8d0fd23 (diff) | |
libsanitizer: cherry-pick from upstream
cherry-pick:
72797dedb720 [sanitizer] Use size_t on g_tls_size to fix build on x32
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 = |