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

tion>
</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=d27f072961d166abe21e844c646816304a73d518'>root</a>/<a href='/guix/log/tests?id=d27f072961d166abe21e844c646816304a73d518'>tests</a>/<a href='/guix/log/tests/services?id=d27f072961d166abe21e844c646816304a73d518'>services</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/services?id=d27f072961d166abe21e844c646816304a73d518&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-02-12 15:11:36 +0800'>2021-02-12</span></td><td><a href='/guix/commit/tests/services?id=db6b9d2f4bc59511904e8c1412d0257675c46095'>services: Add transmission-daemon service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/file-sharing.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* po/packages/POTFILES.in: Add it.
* tests/services/file-sharing.scm: New file.
* Makefile.am (SCM_TESTS): Add it.
* doc/guix.texi (File-Sharing Services): New section.

Signed-off-by: 宋文武 &lt;iyzsong@member.fsf.org&gt;
</span></span></td><td>Simon South</td></tr>
<tr><td><span title='2020-08-02 15:54:37 +0300'>2020-08-02</span></td><td><a href='/guix/commit/tests/services?id=587e0d911dfff81647015e89847084b606e68f71'>services: Add zram-device-service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/linux.scm (&lt;zram-device-configuration&gt;): New record.
(zram-device-service-type): New variable.
* doc/guix.texi (Linux Services): Document it.
* tests/services/linux.scm (zram-swap-device-test): New tests.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-01-31 23:37:13 -0500'>2020-01-31</span></td><td><a href='/guix/commit/tests/services?id=d3e439e355284f136ff13eb3e6fffb4661552f3b'>gnu: Add earlyoom-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/linux.scm: New file.
* tests/services/linux.scm: Add test.
* Makefile.am (SCM_TESTS): Register test.
* doc/guix.texi (Linux Services): Add a new section and document the new
service and its configuration.
</span></span></td><td>Maxim Cournoyer</td></tr>