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)


</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e2604812e0bcb13e00276d62d69d54090ab4eea0&amp;showmsg=1'>root</a>/<a href='/guix/log/tests?id=e2604812e0bcb13e00276d62d69d54090ab4eea0&amp;showmsg=1'>tests</a>/<a href='/guix/log/tests/guix-system.sh?id=e2604812e0bcb13e00276d62d69d54090ab4eea0&amp;showmsg=1'>guix-system.sh</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/guix-system.sh?id=e2604812e0bcb13e00276d62d69d54090ab4eea0'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-01-19 17:16:56 +0100'>2021-01-19</span></td><td class='logsubject'><a href='/guix/commit/tests/guix-system.sh?id=e74baa124592428f05b17562f180469e405037f3'>system: Rename 'disk-image' command 'image'.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/scripts/system.scm (system-derivation-for-action): Rename 'disk-image'
command 'image'. Warn when using the now deprecated 'disk-image' command.
(show-help): Adapt accordingly.
(guix-system): Ditto.
* tests/guix-system.sh: Ditto.
* gnu/system/examples/bare-hurd.tmpl: Ditto.
* doc/guix.texi (Building the Installation Image,
Building the Installation Image for ARM Boards,
Invoking guix pack,
Invoking guix system): Adapt documentation.


</td></tr>
<tr class='logheader'><td><span title='2021-01-13 22:24:18 +0100'>2021-01-13</span></td><td class='logsubject'><a href='/guix/commit/tests/guix-system.sh?id=0d22fc8d36e4efba9748c94cab7cedbbe2bbb5bf'>services: shepherd: 'shepherd-service-type' requires documentation.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/shepherd.scm (shepherd-service-type): Require a
'description' form.
* gnu/services/base.scm (root-file-system-service-type)
(rngd-service-type, host-name-service-type):
(virtual-terminal-service-type, console-keymap-service-type)
(syslog-service-type, swap-service-type)
(kmscon-service-type): Add description.
* gnu/services/networking.scm (dhcp-client-service-type): Likewise.
* gnu/system/install.scm (cow-store-service-type): Likewise.
* gnu/system/linux-container.scm (dummy-networking-service-type):
Likewise.
* gnu/system/mapped-devices.scm (device-mapping-service-type):
Likewise.
* tests/guix-system.sh: Likewise.


</td></tr>
<tr class='logheader'><td><span title='2020-11-06 16:38:12 +0100'>2020-11-06</span></td><td class='logsubject'><a href='/guix/commit/tests/guix-system.sh?id=9e2523c25f7b8d6e8c29c679ad899703a120eed8'>tests: Test "guix system search .".</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This is a followup to 0c5d0c57d370b34f3ba677838deaa8baf7bca58a.

* tests/guix-system.sh: Run "guix system search .".


</td></tr>
<tr class='logheader'><td><span title='2020-10-02 08:11:38 +0200'>2020-10-02</span></td><td class='logsubject'><a href='/guix/commit/tests/guix-system.sh?id=f43ffee90882c2d61b46d69728daa7432be297e4'>gexp: 'local-file' warns when passed a non-literal relative file name.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/43736&gt;.
Reported by Vitaliy Shatrov &lt;guix.vits@disroot.org&gt;.

* guix/gexp.scm (%local-file): Add #:literal? and #:location.
Emit a warning when LITERAL? is false and FILE is not absolute.
(local-file): In the non-literal case, pass #:location and #:literal?.
* po/guix/POTFILES.in: Add guix/gexp.scm.
* tests/guix-system.sh: Add test for the warning.


</td></tr>
<tr class='logheader'><td><span title='2020-09-30 10:47:59 +0200'>2020-09-30</span></td><td class='logsubject'><a href='/guix/commit/tests/guix-system.sh?id=313f492657f1d0863c641fa5ee7f5b7028e27c94'>scripts: system: Add support for image-type.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/scripts/system.scm (list-image-types): New procedure,
(%options): add "image-type" and "list-image-types" options, remove
"file-system-type" option,
(show-help): adapt accordingly,
(%default-options): also adapt, and set the default "image-type" to "raw",
(perform-action): add image-type argument and remove file-system-type argument,
(process-action):  adapt perform-action call,
(system-derivation-for-action): remove base-image
argument, add image-type argument, and use it to create the image passed to
"system-image".
* tests/guix-system.sh: Adapt accordingly and add a test for
"--list-image-types" command.
* doc/guix.texi (Building the Installation Image,
Invoking guix system): Adapt accordingly.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2020-06-08 13:51:19 +0200'>2020-06-08</span></td><td class='logsubject'><a href='/guix/commit/tests/guix-system.sh?id=59bcffa314171294278444aad4b7012abe50257a'>system: examples: Add bare-hurd.tmpl.</a></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/system/hurd.scm (%hurd-def%hurd-default-operating-system-kernel,
%hurd-default-operating-system): New exported variables.
* gnu/system/examples/bare-hurd.tmpl: New file.
* Makefile.am (EXAMPLES): Add it.
* tests/guix-system.sh: Add --target=i586-pc-gnu when testing it.


</td></tr>