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)
href='/guix/log/?id=99dfb5bfd9f6e0064d270f094020d1f07ed6e4c1'>root</a>/<a href='/guix/log/doc?id=99dfb5bfd9f6e0064d270f094020d1f07ed6e4c1'>doc</a>/<a href='/guix/log/doc/fdl-1.3.texi?id=99dfb5bfd9f6e0064d270f094020d1f07ed6e4c1'>fdl-1.3.texi</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/doc/fdl-1.3.texi?id=99dfb5bfd9f6e0064d270f094020d1f07ed6e4c1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-03-10 20:26:52 +0100'>2020-03-10</span></td><td><a href='/guix/commit/doc/fdl-1.3.texi?id=21656ffa3b6d78a610f0befced20cc9b4b3baab6'>doc: Use HTTPS for external links.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/contributing.texi
  (14.1 Building from Git,
   14.3 The Perfect Setup,
   14.4.1 Software Freedom,
   14.4.4 Synopses and Descriptions,
   14.5.4 Formatting Code):
   Use HTTPS for @uref{}s and @url{}s that support it.

* doc/fdl-1.3.texi
  (Appendix A GNU Free Documentation License):
  Use HTTPS for @uref{}s and @url{}s that support it.

* doc/guix.texi
  (6.3 Build Systems,
   8.8.4 Networking Services,
   8.8.8 Sound Services,
   8.8.16 Web Services,
   8.11 Name Service Switch,
   12.2 Preparing to Use the Bootstrap Binaries);
   Use HTTPS for @uref{}s and @url{}s that support it.

Signed-off-by: Marius Bakke &lt;mbakke@fastmail.com&gt;
</span></span></td><td>Vitaliy Shatrov</td></tr>