diff options
Diffstat (limited to '0001-fix-sys-ustat.h-problem.patch')
| -rw-r--r-- | 0001-fix-sys-ustat.h-problem.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/0001-fix-sys-ustat.h-problem.patch b/0001-fix-sys-ustat.h-problem.patch new file mode 100644 index 0000000..34b1522 --- /dev/null +++ b/0001-fix-sys-ustat.h-problem.patch @@ -0,0 +1,44 @@ +From 88fe8bed49ebbf86c29990bdb536171bb1ae4d3d Mon Sep 17 00:00:00 2001 +From: <zhangwuji1@huawei.com> +Date: Wed, 7 Jun 2023 14:24:43 +0000 +Subject: [PATCH] fix sys/ustat.h problem + +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=71b55d45e4304f5e2e98ac30473c581f58fc486b +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +index 858bb218450..de18e56d11c 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -157,7 +157,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> +@@ -250,7 +249,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 +--
\ No newline at end of file |