--- compiler-rt-orig/lib/sanitizer_common/sanitizer_common_syscalls.inc	2018-05-21 10:41:12.089534263 -0500
+++ compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc	2018-05-21 10:47:21.172510188 -0500
@@ -923,16 +923,6 @@
   }
 }
 
-#if !SANITIZER_ANDROID
-PRE_SYSCALL(ustat)(long dev, void *ubuf) {}
-
-POST_SYSCALL(ustat)(long res, long dev, void *ubuf) {
-  if (res >= 0) {
-    if (ubuf) POST_WRITE(ubuf, struct_ustat_sz);
-  }
-}
-#endif  // !SANITIZER_ANDROID
-
 PRE_SYSCALL(stat64)(const void *filename, void *statbuf) {
   if (filename)
     PRE_READ(filename,
diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
--- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	2018-05-21 10:41:12.080534263 -0500
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	2018-05-21 10:45:29.503517472 -0500
@@ -159,7 +159,6 @@
 # include <sys/procfs.h>
 #endif
 #include <sys/user.h>
-#include <sys/ustat.h>
 #include <linux/cyclades.h>
 #include <linux/if_eql.h>
 #include <linux/if_plip.h>
@@ -253,7 +252,6 @@
 #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
-  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
diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
--- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h	2018-05-21 10:41:12.081534263 -0500
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h	2018-05-21 10:44:28.392521458 -0500
@@ -197,7 +197,6 @@
     int v[10];
   };
 
-  extern unsigned struct_ustat_sz;
   extern unsigned struct_rlimit64_sz;
   extern unsigned struct_statvfs64_sz;