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

m>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/'>root</a>/<a href='/guix/log/gnu'>gnu</a>/<a href='/guix/log/gnu/packages'>packages</a>/<a href='/guix/log/gnu/packages/patches'>patches</a>/<a href='/guix/log/gnu/packages/patches/python-optree-fix-32-bit.patch'>python-optree-fix-32-bit.patch</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/gnu/packages/patches/python-optree-fix-32-bit.patch?showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span class='age-days' data-ut='1737985360' title='2025-01-27 14:42:40 +0100'>14 days</span></td><td><a href='/guix/commit/gnu/packages/patches/python-optree-fix-32-bit.patch?id=c8ceb0cb8351adcb87c23b5c87b5e8725a94dc4e'>gnu: python-optree: Update to 0.14.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/python-xyz.scm (python-optree): Update to 0.14.0.
[source]: Remove patch.
[arguments]&lt;#:test-flags&gt;: Disable additional failing test.
[native-inputs]: Replace pybind11 with pybind11-2.13 and cmake with
cmake-minimal.
* gnu/packages/patches/python-optree-fix-32-bit.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>David Elsing</td></tr>