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

r</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=32792d2073f3096cb0710c40a7c74e5797ef0e6e'>root</a>/<a href='/guix/log/gnu?id=32792d2073f3096cb0710c40a7c74e5797ef0e6e'>gnu</a>/<a href='/guix/log/gnu/build?id=32792d2073f3096cb0710c40a7c74e5797ef0e6e'>build</a>/<a href='/guix/log/gnu/build/locale.scm?id=32792d2073f3096cb0710c40a7c74e5797ef0e6e'>locale.scm</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/build/locale.scm?id=32792d2073f3096cb0710c40a7c74e5797ef0e6e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-07 21:50:18 +0200'>2019-06-07</span></td><td><a href='/guix/commit/gnu/build/locale.scm?id=0e6cee21a48294b81a5e57e00602728fe7f7075f'>gnu: glibc-locales: Install symlinks using the normalized codeset.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/36076&gt;.
Reported by Jack Hill &lt;jackhill@jackhill.us&gt;
and Giovanni Biscuolo &lt;g@xelera.eu&gt;

* gnu/build/locale.scm (locale-&gt;name+codeset): New file.
* gnu/packages/base.scm (make-glibc-locales): Add #:modules
and #:imported-modules.  Add a 'symlink-normalized-codesets' phase.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-06-07 21:50:18 +0200'>2019-06-07</span></td><td><a href='/guix/commit/gnu/build/locale.scm?id=15ec93a7832ae7dde747ccd9bb2bb2776be9f199'>Add (gnu build locale).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/locale.scm: New file.
* gnu/local.mk (MODULES_NOT_COMPILED): Add it.
* gnu/installer/locale.scm (normalize-codeset): Remove.
* gnu/system/locale.scm (localedef-command): Remove.
(single-locale-directory): Use (gnu build locale).
(glibc-supported-locales)[build]: Likewise, and remove
'read-supported-locales'.
</span></span></td><td>Ludovic Courtès</td></tr>