diff options
Diffstat (limited to 'glibc.diff')
| -rw-r--r-- | glibc.diff | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/glibc.diff b/glibc.diff new file mode 100644 index 000000000000..133d4c2e1ede --- /dev/null +++ b/glibc.diff @@ -0,0 +1,32 @@ +diff -aur llvm-5.0.2.src.old/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc llvm-5.0.2.src.new/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +--- llvm-5.0.2.src.old/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-09-20 16:22:48.828377892 +0200 ++++ llvm-5.0.2.src.new/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-09-20 16:23:32.361128588 +0200 +@@ -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> +@@ -251,7 +251,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 |