svn commit: r335724 - vendor/compiler-rt/dist-release_60/lib/sanitizer_common

[Dimitry Andric]

Author: dim
Date: Wed Jun 27 19:14:44 2018
New Revision: 335724
URL: https://svnweb.freebsd.org/changeset/base/335724

Log:
  Vendor import of compiler-rt 6.0.1 release r335540:
  https://llvm.org/svn/llvm-project/compiler-rt/tags/RELEASE_601/final@335540

Modified:
  vendor/compiler-rt/dist-release_60/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

Modified: vendor/compiler-rt/dist-release_60/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
==============================================================================
--- vendor/compiler-rt/dist-release_60/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	Wed Jun 27 19:14:40 2018	(r335723)
+++ vendor/compiler-rt/dist-release_60/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	Wed Jun 27 19:14:44 2018	(r335724)
@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t;
 # 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,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