Fix assertion failure in libsanitizer when using glibc 2.31 and later.

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154
https://reviews.llvm.org/D69104

Adapted from these upstream revision:

https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981
https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653

diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
index 97eae3fc7bc..4089d4695e2 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1145,8 +1145,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
+   on many architectures.  */
 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
 #endif
 
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index c139322839a..7c3c2d866e5 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -211,20 +211,13 @@ namespace __sanitizer {
     unsigned long __unused1;
     unsigned long __unused2;
 #elif defined(__sparc__)
-# if defined(__arch64__)
     unsigned mode;
-    unsigned short __pad1;
-# else
-    unsigned short __pad1;
-    unsigned short mode;
     unsigned short __pad2;
-# endif
     unsigned short __seq;
     unsigned long long __unused1;
     unsigned long long __unused2;
 #else
-    unsigned short mode;
-    unsigned short __pad1;
+    unsigned int mode;
     unsigned short __seq;
     unsigned short __pad2;
 #if defined(__x86_64__) && !defined(_LP64)

'>root</a>/<a href='/guix/log/gnu?id=0d5286b8a67be2012e892f6762a145d89d013c44'>gnu</a>/<a href='/guix/log/gnu/system?id=0d5286b8a67be2012e892f6762a145d89d013c44'>system</a>/<a href='/guix/log/gnu/system/locale.scm?id=0d5286b8a67be2012e892f6762a145d89d013c44'>locale.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/locale.scm?id=0d5286b8a67be2012e892f6762a145d89d013c44&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-14 14:29:20 +0100'>2022-01-14</span></td><td><a href='/guix/commit/gnu/system/locale.scm?id=9d0d4b331d21cf555fdd6a8844d05389d934832c'>system: locale: Use only the current glibc.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2021-05-15 22:55:24 +0200'>2021-05-15</span></td><td><a href='/guix/commit/gnu/system/locale.scm?id=25487c3fe6a41dd62f6e53f256392224a3be2a08'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-05-04 14:19:11 +0200'>2021-05-04</span></td><td><a href='/guix/commit/gnu/system/locale.scm?id=2e4808465d7ea5cbff0486a515cd67e3370877ce'>locale: Remove glibc 2.29 from '%default-locale-libcs'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-20 23:56:17 +0200'>2020-09-20</span></td><td><a href='/guix/commit/gnu/system/locale.scm?id=855bc05e118913ddc5d4c544a77a2f82c9df929c'>gnu: glibc: Add version 2.31.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-08-26 18:45:28 +0200'>2020-08-26</span></td><td><a href='/guix/commit/gnu/system/locale.scm?id=6c443975c9cb94131f5956378495c6e3b627b6aa'>system: locale: Only use the current glibc.</a><span class='msg-avail'>...</span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-05-15 00:01:39 +0200'>2020-05-15</span></td><td><a href='/guix/commit/gnu/system/locale.scm?id=4daa7a85b41c10d70893675edf1ac61ebd3bf746'>locale: Use the native gzip and libc when building locales.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>