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 196eb3b3c64..b588e07e5ab 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -928,7 +928,11 @@ 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 !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
 CHECK_SIZE_AND_OFFSET(ipc_perm, __seq);
 
 CHECK_TYPE_SIZE(shmid_ds);
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index aec950454b3..6d94fc65c28 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -154,20 +154,13 @@ namespace __sanitizer {
     u64 __unused1;
     u64 __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)
g/?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'>root</a>/<a href='/guix/log/tests?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'>tests</a>/<a href='/guix/log/tests/glob.scm?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a'>glob.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/tests/glob.scm?id=0f2e8e94f16c6f71f4b27bf20bf3c9c4acea6d0a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-09 22:25:17 +0100'>2020-12-09</span></td><td><a href='/guix/commit/tests/glob.scm?id=371ba7b4be81895d202519824bf19893bfdb2526'>guix: Add globstar support.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/glob.scm (string-&gt;sglob)
(glob-match?): Add globstar support.
* tests/glob.scm: Update accordingly.

Signed-off-by: Jelle Licht &lt;jlicht@fsfe.org&gt;
</span></span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2018-03-18 22:57:17 +0100'>2018-03-18</span></td><td><a href='/guix/commit/tests/glob.scm?id=71e08fde28fa335bdba2ec2150fd6663390bba5a'>glob: Add an extra glob pattern compilation stage.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/glob.scm (compile-glob-pattern): Rename to...
(string-&gt;sglob): ... this.
(compile-sglob, string-&gt;compiled-sglob): New procedures.
(glob-match?): Replace '?, 'range, and 'set with a single clause.
* tests/glob.scm (test-compile-glob-pattern): Rename to...
(test-string-&gt;sglob): ... this.  Adjust accordingly.
(test-glob-match): Use 'string-&gt;compiled-sglob' instead of
'compile-glob-pattern'.
* gnu/build/linux-modules.scm (read-module-aliases): Use
'string-&gt;compiled-sglob' instead of 'compile-glob-pattern'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-18 22:35:36 +0100'>2018-03-18</span></td><td><a href='/guix/commit/tests/glob.scm?id=e914b398af11f909e88a8bc85eeebb0768aacd54'>glob: Support square brackets in patterns.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/glob.scm (wildcard-indices): Remove.
(parse-bracket): New procedure.
(compile-glob-pattern): Rewrite.  Support square brackets for sets and
ranges.
(glob-match?): Support sets and ranges.
* tests/glob.scm (test-compile-glob-pattern)
(test-glob-match): New macros.
Use them to rewrite the existing tests, and add new tests.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-03-02 13:46:25 +0100'>2018-03-02</span></td><td><a href='/guix/commit/tests/glob.scm?id=f14c933df16ee0faee6bff8004da4e5d3e1caf07'>Add (guix glob).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/glob.scm, tests/glob.scm: New files.
* Makefile.am (MODULES): Add guix/glob.scm.
(SCM_TESTS): Add tests/glob.scm.
</span></span></td><td>Ludovic Courtès</td></tr>