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

7b0523fc03831328d759c4fb7505783e2'>diff</a></td><td class='form'><form class='right' method='get' action='/browser-extension/log/README.md'>
<input type='hidden' name='id' value='95bc9b67b0523fc03831328d759c4fb7505783e2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<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='/browser-extension/log/?id=95bc9b67b0523fc03831328d759c4fb7505783e2'>root</a>/<a href='/browser-extension/log/README.md?id=95bc9b67b0523fc03831328d759c4fb7505783e2'>README.md</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/browser-extension/log/README.md?id=95bc9b67b0523fc03831328d759c4fb7505783e2&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-06-18 12:30:42 +0200'>2022-06-18</span></td><td><a href='/browser-extension/commit/README.md?id=f33dbdee39953f145bb986a7488e65e55e25d49d'>bump version to 2.0-beta1</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-04-13 12:21:09 +0200'>2022-04-13</span></td><td><a href='/browser-extension/commit/README.md?id=4d866cf6f8c051098ff001562cbf8cb84980473a'>bump version to 1.0</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-02-18 18:56:17 +0100'>2022-02-18</span></td><td><a href='/browser-extension/commit/README.md?id=43397bb9e40897560ad2a58c82cc8b7e3e257fbc'>fix mistake in README</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-02-17 16:34:56 +0100'>2022-02-17</span></td><td><a href='/browser-extension/commit/README.md?id=ee0a4a935a95a9472655f85a04e1323f3d328898'>automatically pick up a free port to run the HTTP proxy on</a><span class='msg-avail'>...</span></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-02-17 16:09:57 +0100'>2022-02-17</span></td><td><a href='/browser-extension/commit/README.md?id=3e4bde861cdee3312e1d410dc08f67d8e7c9168c'>fix test-environment* targets</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-02-17 13:32:42 +0100'>2022-02-17</span></td><td><a href='/browser-extension/commit/README.md?id=753fd58a5778b634dcc9849d3ecb3fb5feb62154'>make README table proper Markdown</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-02-17 13:07:25 +0100'>2022-02-17</span></td><td><a href='/browser-extension/commit/README.md?id=bf3b0ca136c7d6c97b1efc9c70d0f502d707df18'>update README.md</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2022-01-04 09:15:32 +0100'>2022-01-04</span></td><td><a href='/browser-extension/commit/README.md?id=372d24ea3a52e376f953deeffeb7847d008b81c9'>fix license promise typo</a></td><td>Wojtek Kosior</td></tr>
<tr><td><span title='2021-12-22 16:39:34 +0100'>2021-12-22</span></td><td><a href='/browser-extension/commit/README.md?id=b590eaa2f64ead3384eadc6fe58f6358aa1a0478'>reworked build system; added missing license notices</a></td><td>Wojtek Kosior</td></tr>