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 069d8d557de..c49c28c6e07 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1130,8 +1130,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
 #ifndef __GLIBC_PREREQ
 #define __GLIBC_PREREQ(x, y) 0
 #endif
-#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 304d04e3935..6dee89c97e1 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -207,20 +207,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)

>
<div class='path'>path: <a href='/guix/log/?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>root</a>/<a href='/guix/log/gnu?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>gnu</a>/<a href='/guix/log/gnu/packages?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>packages</a>/<a href='/guix/log/gnu/packages/textutils.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271'>textutils.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/packages/textutils.scm?id=c8b19d97833243e7e89f8ca83a0d641de6516271&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-02-02 14:44:01 +0200'>2022-02-02</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=8f585083277e64ea1e9a0848ef3c49f12327618c'>gnu: utf-8-lineseparator: Update to cj8.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/textutils.scm (utf-8-lineseparator): Update to cj8.

Signed-off-by: Efraim Flashner &lt;efraim@flashner.co.il&gt;
</span></span></td><td>jgart</td></tr>
<tr><td><span title='2022-01-26 17:54:58 +0100'>2022-01-26</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=8b7bd459dc7f86cf2a9569c35efb4a5d845d63ed'>gnu: utf-8-lineseparator: Update to 7.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/textutils.scm (utf-8-lineseparator): Update to 7.  Adjust
'commit' field accordingly.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>jgart</td></tr>
<tr><td><span title='2022-01-23 23:14:33 +0100'>2022-01-23</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=aeeaf4eef40811d2f934cff914ba31dbbf04d449'>gnu: Add utf-8-lineseparator.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/textutils.scm (utf-8-lineseparator): New variable.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>jgart</td></tr>
<tr><td><span title='2021-12-24 16:31:04 +0100'>2021-12-24</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=46772aa0f00770d57fd29fd04d678197f04aad0c'>gnu: Add bibutils.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/textutils.scm (bibutils): New variable.
</span></span></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2021-12-24 16:31:04 +0100'>2021-12-24</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=9d636f2d7b7a9fca0eb05495509bc1595edfb486'>gnu: Move go-github-com-aswinkarthik-csvdiff to textutils.</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes a build error caused by cross-module use of deprecated-package.

* gnu/packages/golang.scm (go-github-com-aswinkarthik-csvdiff): Move from
here...
* gnu/packages/textutils.scm (go-github-com-aswinkarthik-csvdiff): ... to here.
</span></span></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2021-12-20 10:58:21 +0530'>2021-12-20</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=b9e5e93342bde25d63f4e6281577c0c4c5311c82'>gnu: Move csvdiff to (gnu packages textutils).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/golang.scm (go-github-com-aswinkarthik-csvdiff): Add deprecated
alias. Move to ...
* gnu/packages/textutils (csvdiff): ... here.

Signed-off-by: Arun Isaac &lt;arunisaac@systemreboot.net&gt;
</span></span></td><td>BonfaceKilz</td></tr>
<tr><td><span title='2021-12-13 22:15:07 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=e3196755e60ba7f1ed9d432e73f26a85e0c8893c'>gnu: Further simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is the result of running:

  ./pre-inst-env guix style --input-simplification=safe

and manually undoing changes on a dozen of packages to reduce
rebuilds (derivations for emacs, icecat, and libreoffice are unchanged.)
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-12-05 19:17:41 +0100'>2021-12-05</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=9bc0f45df5d6aed217020b1183dca54989844fb0'>Merge remote-tracking branch 'origin/master' into core-updates-frozen</a></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2021-12-03 10:41:37 +0100'>2021-12-03</span></td><td><a href='/guix/commit/gnu/packages/textutils.scm?id=fcf7e6513c1bd8471e91c7da25a6a09971680282'>gnu: python-pandocfilters: Update to 1.5.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/textutils.scm (python-pandocfilters): Update to 1.5.0.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>jgart</td></tr>