On Fri, 1 Jul 2022, Dimitrije Milosevic wrote: > Fix kernel_stat structure size for non-Android 32-bit Mips. > LLVM currently has this value for the kernel_stat structure size, > as per compiler-rt/lib/sanitizer-common/sanitizer_platform_limits_posix.h. > This also resolves one of the build issues for non-Android 32-bit Mips.
I insist that PR105614 comment #7 is the way to go, i.e. fix the merge error, avoiding the faulty include that it reintroduced. Was this tested on O32? > > libsanitizer/ChangeLog: > > * sanitizer_common/sanitizer_platform_limits_posix.h: Fix > kernel_stat structure size for non-Android 32-bit Mips. > > --- > > libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h > b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h > index 89772a7e5c0..62a99035db3 100644 > --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h > +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h > @@ -83,7 +83,7 @@ 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); > + : FIRST_32_SECOND_64(160, 216); > const unsigned struct_kernel_stat64_sz = 104; > #elif defined(__s390__) && !defined(__s390x__) > const unsigned struct_kernel_stat_sz = 64; > > ---
