1234567891011121314151617181920212223242526272829303132 |
- --- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/04/25 07:39:32 259630
- +++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/05/24 20:07:25 260687
- @@ -138,7 +138,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>
- @@ -231,7 +230,19 @@
- #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
|