Created
September 16, 2018 13:41
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- gcc-4.9.4.orig/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2013-12-19 13:54:11.000000000 +0100 | |
| +++ gcc-4.9.4/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-09-16 15:23:46.141733145 +0200 | |
| @@ -81,7 +81,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> | |
| @@ -163,7 +162,19 @@ | |
| unsigned struct_old_utsname_sz = sizeof(struct old_utsname); | |
| unsigned struct_oldold_utsname_sz = sizeof(struct oldold_utsname); | |
| unsigned struct_itimerspec_sz = sizeof(struct itimerspec); | |
| - 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__) || defined(__sparc__) | |
| +#define SIZEOF_STRUCT_USTAT 20 | |
| +#else | |
| +#error Unknown size of struct ustat | |
| +#endif | |
| + unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; | |
| #endif // SANITIZER_LINUX | |
| #if SANITIZER_LINUX && !SANITIZER_ANDROID |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment