From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id ADCF33858422; Mon, 1 Aug 2022 04:11:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ADCF33858422 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1909] libsanitizer: Cherry-pick 2bfb0fcb51510f22723c8cdfefe from upstream X-Act-Checkin: gcc X-Git-Author: =?utf-8?b?RGltaXRyaWplIE1pbG/FoWV2acSH?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 4a7274ddc4970c1ad011343ed285d6219dffa396 X-Git-Newrev: 1efeaf99bd8bdfe2a350b8a56b88ed6e00594e54 Message-Id: <20220801041103.ADCF33858422@sourceware.org> Date: Mon, 1 Aug 2022 04:11:03 +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: Mon, 01 Aug 2022 04:11:03 -0000 https://gcc.gnu.org/g:1efeaf99bd8bdfe2a350b8a56b88ed6e00594e54 commit r13-1909-g1efeaf99bd8bdfe2a350b8a56b88ed6e00594e54 Author: Dimitrije Milošević 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 . 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;