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)

rm>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=7712500a20ce5c801e732c3fb5549872754df644'>root</a>/<a href='/guix/log/gnu?id=7712500a20ce5c801e732c3fb5549872754df644'>gnu</a>/<a href='/guix/log/gnu/packages?id=7712500a20ce5c801e732c3fb5549872754df644'>packages</a>/<a href='/guix/log/gnu/packages/pretty-print.scm?id=7712500a20ce5c801e732c3fb5549872754df644'>pretty-print.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/pretty-print.scm?id=7712500a20ce5c801e732c3fb5549872754df644&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-02 18:54:24 +0100'>2021-01-02</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=35d6d33a6cae99c6b4b689760e70fa0dcd163bc1'>gnu: highlight: Update to 3.60.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pretty-print.scm (highlight): Update to 3.60.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-11-15 00:38:32 +0100'>2020-11-15</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=cd551413eef6fbf54eff20792661e9fc279bdd7f'>gnu: highlight: Update to 3.59.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pretty-print.scm (highlight): Update to 3.59.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-11-11 21:37:12 +0100'>2020-11-11</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=5b48d6de23fb3936750df7571d3067b28a8ee6d1'>gnu: a2ps: Remove unused input.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pretty-print.scm (a2ps)[inputs]: Remove IMAGEMAGICK.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-10-09 23:59:14 +0200'>2020-10-09</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=2f4b51ab22b312b11656f70e2dd08290592358d3'>gnu: source-highlight: Allow cross-compilation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pretty-print.scm (source-highlight)[arguments]: Add
'skip-doc-directory' when (%current-target-system) is true.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-15 12:02:28 +0300'>2020-09-15</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=a8360892d734b6c7418dd600b838faf2b2eda30c'>gnu: waybar: Fix build.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by bdju.

* gnu/packages/pretty-print.scm (fmt-6): New variable.
* gnu/packages/wm.scm (waybar)[inputs]: Replace fmt with fmt-6.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-09-13 23:34:23 +0200'>2020-09-13</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=0f918908ebcfc1d5aeb780d6fbe5c52a48178e85'>gnu: fmt: Update to 7.0.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>From 820d39a55a5673fffac70c919b8cc3b28d94f6e7 Mon Sep 17 00:00:00 2001
From: Greg Hogan &lt;code@greghogan.com&gt;
Date: Fri, 11 Sep 2020 10:53:20 +0000
Subject: [PATCH] gnu: fmt: Update to 7.0.3.

* gnu/packages/pretty-print.scm (fmt): Update to 7.0.3.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Greg Hogan</td></tr>
<tr><td><span title='2020-09-11 16:28:02 +0200'>2020-09-11</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=6bdc3b429af1d1be7120c594c0ed4826acde9c3d'>gnu: highlight: Update to 3.58.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pretty-print.scm (highlight): Update to 3.58.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-06-30 21:13:51 +0300'>2020-06-30</span></td><td><a href='/guix/commit/gnu/packages/pretty-print.scm?id=13bd54b15da134012d40822c867bc70aa0bb14af'>gnu: Sort package modules alphabetically in (gnu packages pretty-print).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/pretty-print.scm: Sort package module imports
alphabetically.
</span></span></td><td>Efraim Flashner</td></tr>