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

t type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=37b08547e4c2f6f4be390baa3608abe8b01aed9c'>root</a>/<a href='/guix/log/po?id=37b08547e4c2f6f4be390baa3608abe8b01aed9c'>po</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?id=37b08547e4c2f6f4be390baa3608abe8b01aed9c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-07-27 11:47:51 +0200'>2017-07-27</span></td><td><a href='/guix/commit/po?id=111b2853c7e18b7dc6b448d6cea944ef7b6409f7'>nls: Mark (guix scripts weather) as translatable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-07-15 19:25:39 +0800'>2017-07-15</span></td><td><a href='/guix/commit/po?id=ee38fbcfaa5afc1cf2bb121a04bc9747b2339c37'>nls: Adjust to qemu.scm renaming.</a><span class='msg-avail'>...</span></td><td>宋文武</td></tr>
<tr><td><span title='2017-06-20 18:10:35 +0530'>2017-06-20</span></td><td><a href='/guix/commit/po?id=148585c240f848ad08f6541ede7db3fca3411007'>gnu: Move contents of zip module into compression module.</a><span class='msg-avail'>...</span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2017-05-23 13:36:58 -0400'>2017-05-23</span></td><td><a href='/guix/commit/po?id=db375739dac31360f5ca945ff06edfd952595cc5'>nls: Update 'da' translation.</a></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-05-14 15:49:49 +0200'>2017-05-14</span></td><td><a href='/guix/commit/po?id=c65d05b5ac6da768ffae1038f02a810f79dca83c'>maint: Do not update PO files upon "make dist".</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-11 23:31:29 +0200'>2017-05-11</span></td><td><a href='/guix/commit/po?id=a3ac1bc285d6d6b7e2202937416ed055cfcdc35f'>nls: Update 'fr' translation.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-04 18:05:05 +0200'>2017-05-04</span></td><td><a href='/guix/commit/po?id=8eb55df48835d08e7b522ac060fa56832172f05e'>nls: Mark (guix discovery) as translatable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-03 16:16:17 +0200'>2017-05-03</span></td><td><a href='/guix/commit/po?id=69daee23af49aeafcb1d250c90860f9253da719e'>ui: Rename '_' to 'G_'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-03-14 17:57:27 +0100'>2017-03-14</span></td><td><a href='/guix/commit/po?id=df1292074440b556c9f015b178f4bd6b4297f8d3'>nls: Mark (guix scripts pack) as translatable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>