[gcc r13-1909] libsanitizer: Cherry-pick 2bfb0fcb51510f22723c8cdfefe from upstream

Martin Liska marxin@gcc.gnu.org
Mon Aug 1 04:11:03 GMT 2022


https://gcc.gnu.org/g:1efeaf99bd8bdfe2a350b8a56b88ed6e00594e54

commit r13-1909-g1efeaf99bd8bdfe2a350b8a56b88ed6e00594e54
Author: Dimitrije Milošević <dimitrije.milosevic@syrmia.com>
Date:   Fri Jul 29 08:36:06 2022 +0200

    libsanitizer: Cherry-pick 2bfb0fcb51510f22723c8cdfefe from upstream
    
    2bfb0fcb51510f22723c8cdfefe [Sanitizer][MIPS] Fix stat struct size for the O32 ABI.
    
    Signed-off-by: Dimitrije Milosevic <dimitrije.milosevic@syrmia.com>.

Diff:
---
 libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index 89772a7e5c0..75c6cc7f285 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -81,9 +81,10 @@ const unsigned struct_kernel_stat64_sz = 104;
 const unsigned struct_kernel_stat_sz = 144;
 const unsigned struct_kernel_stat64_sz = 104;
 #elif defined(__mips__)
-const unsigned struct_kernel_stat_sz = SANITIZER_ANDROID
-                                           ? FIRST_32_SECOND_64(104, 128)
-                                           : FIRST_32_SECOND_64(144, 216);
+const unsigned struct_kernel_stat_sz =
+    SANITIZER_ANDROID
+        ? FIRST_32_SECOND_64(104, 128)
+        : FIRST_32_SECOND_64((_MIPS_SIM == _ABIN32) ? 160 : 144, 216);
 const unsigned struct_kernel_stat64_sz = 104;
 #elif defined(__s390__) && !defined(__s390x__)
 const unsigned struct_kernel_stat_sz = 64;


More information about the Gcc-cvs mailing list