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

thor'>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='/guix/log/?id=933f2ca76acd8da03880569684cf10a4b3094a60'>root</a>/<a href='/guix/log/doc?id=933f2ca76acd8da03880569684cf10a4b3094a60'>doc</a>/<a href='/guix/log/doc/images?id=933f2ca76acd8da03880569684cf10a4b3094a60'>images</a>/<a href='/guix/log/doc/images/service-graph.dot?id=933f2ca76acd8da03880569684cf10a4b3094a60'>service-graph.dot</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/images/service-graph.dot?id=933f2ca76acd8da03880569684cf10a4b3094a60&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
-11-01 02:39:13 +0100'>2024-11-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=dd63cd7876f8c6a6eb42170219c17659ff4daf42'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: I15d674cd8e88250daa4284e8137a808c5298548f
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-10-01 00:47:02 +0200'>2024-10-01</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=25ff62e2501badd10c55e81ef2e8655fb8f85177'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: Ic1f7216e35c17c3de07a5e56ce582c236dadafcd
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-06-03 00:27:12 +0200'>2024-06-03</span></td><td><a href='/guix/commit/po/doc/guix-cookbook.ko.po?id=834a4195241806784d4b321b95f06d85f458ce18'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.sv.po: New file.
* po/doc/local.mk: Add 'sv' cookbook.
* po/doc/po4a.cfg (po4a_langs): Add 'sv'.
* doc/local.mk: Add 'sv' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'sv'.
* doc/guix-cookbook.texi (Top): Mention 'sv' cookbook.

Change-Id: Ibfeb7254f583f1c8827e8c2756bbb02880bcba46
</span></span></td><td>Florian Pelz</td></tr>