From d9d97cac3702b99a00cd113de98c41eb535d47ed Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Sun, 14 Oct 2018 12:11:30 +0300
Subject: [PATCH] patch modified from the gcc patch series, also dealing with
 ustat.

---
 .../sanitizer_platform_limits_posix.cc            | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
index 29fea6e..570b9a5 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -129,7 +129,6 @@
 #include <sys/statvfs.h>
 #include <sys/timex.h>
 #include <sys/user.h>
-#include <sys/ustat.h>
 #include <linux/cyclades.h>
 #include <linux/if_eql.h>
 #include <linux/if_plip.h>
@@ -222,7 +221,19 @@ namespace __sanitizer {
 #endif  // SANITIZER_LINUX || SANITIZER_FREEBSD
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
-  unsigned struct_ustat_sz = sizeof(struct ustat);
+  // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
+  // has been removed from glibc 2.28.
+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
+  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
+  || defined(__x86_64__)
+#define SIZEOF_STRUCT_USTAT 32
+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
+  || defined(__powerpc__) || defined(__s390__)
+#define SIZEOF_STRUCT_USTAT 20
+#else
+#error Unknown size of struct ustat
+#endif
+  unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
 #endif  // SANITIZER_LINUX && !SANITIZER_ANDROID
-- 
2.19.1

on>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=aecc6e70587f8412cbbb9b2c13141de4f534518e'>root</a>/<a href='/guix/log/po?id=aecc6e70587f8412cbbb9b2c13141de4f534518e'>po</a>/<a href='/guix/log/po/packages?id=aecc6e70587f8412cbbb9b2c13141de4f534518e'>packages</a>/<a href='/guix/log/po/packages/LINGUAS?id=aecc6e70587f8412cbbb9b2c13141de4f534518e'>LINGUAS</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/po/packages/LINGUAS?id=aecc6e70587f8412cbbb9b2c13141de4f534518e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-05 08:14:55 +0100'>2023-01-05</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=dc7eb6f07ae982b4c9d083cfb10f72cb031c0424'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/guix/ka.po: New file.
* po/guix/LINGUAS: Add it.
* po/packages/uk.po: New file.
* po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-12-04 22:25:23 +0100'>2022-12-04</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=2e75b328b6bbdadbffe5b643a4891b5026a0defd'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/packages/vi.po: New file.
po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-06-04 17:42:54 +0200'>2022-06-04</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=809c57c872a6dd48007d1abf6d7f3dd1482ec53a'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/packages/tr.po: New file.
po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-04-02 18:42:36 +0200'>2022-04-02</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=8a208df17fe81fbf34f5a86cc52bb0b8e33c7b96'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/fi.po: New file.
* po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-09-02 04:06:52 +0200'>2021-09-02</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=1ff2092a39dc5c7c7cd9b4a0ba4b59f92e738efc'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/it.po: New file.
* po/packages/LINGUAS: Add `it'.
* po/*/*.po: Update translations.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-05-10 22:27:53 -0400'>2021-05-10</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=63d26e81eea7be63caeb0eb7ca26ca1cf963ec97'>nls: New nl and oc translations for the 'packages' component.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/nl.po: New file.
* po/packages/oc.po: Likewise.
* po/packages/LINGUAS: Register them.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-18 21:07:24 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=a209c597e2e4e030bbaeb449779b311736026aa1'>nls: Remove 'vi' in LINGUAS</a><span class='msg-avail'>...<span class='msg-tooltip'>The po file is no longer available.

* po/packages/LINGUAS: Remove 'vi'.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-04-18 13:18:22 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=0f355124af123f793bfd3011341d2d539c965884'>nls: Add Korean translation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.ko.po: New file.
* po/doc/guix-manual.ko.po: New file.
* doc/local.mk (info_TEXINFOS): Add them.
* po/doc/local.mk (DOC_PO_FILES, DOC_COOKBOOK_PO_FILES): Add them.
* po/guix/ko.po: New file.
* po/guix/LINGUAS: Add 'ko'.
* po/packages/ko.po: New file.
* po/packages/LINGUAS: Add 'ko'.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-04-18 13:18:17 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>nls: Add Persian translation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/fa.po: New file.
* po/packages/LINGUAS: Add 'fa'.
* po/doc/guix-cookbook.fa.po: New file.
* po/doc/guix-manual.fa.po: New file.
* po/doc/local.mk (DOC_PO_FILES, DOC_COOKBOOK_PO_FILES): Add them.
* doc/local.mk (info_TEXINFOS): Add them.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-04-18 13:18:13 +0200'>2021-04-18</span></td><td><a href='/guix/commit/po/packages/LINGUAS?id=77c6c0aa577939da4d35a1ba95ea998459a3f337'>nls: Add Slovak translation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/sk.po: New file.
* po/packages/LINGUAS: Add 'sk'.
* po/doc/guix-manual.sk.po: New file.
* doc/local.mk (info_TEXINFOS): Add it.
* po/doc/local.mk (DOC_PO_FILES): Add it.
</span></span></td><td>Julien Lepiller</td></tr>