diff options
author | Matteo Bernardini | 2020-06-20 11:01:26 +0200 |
---|---|---|
committer | Matteo Bernardini | 2020-06-20 11:01:26 +0200 |
commit | 4763c5f8092b9a9edb2471bd83ae5d6935056245 (patch) | |
tree | 704bea10c1fd69bf1b603c44f81d0d1b4df89019 /development/gcc5/patches/glibc2.28-ustat.diff | |
parent | 98dec0c0253801e4775e1c705f391e477db1a7e5 (diff) | |
download | slackbuilds-4763c5f8092b9a9edb2471bd83ae5d6935056245.tar.gz |
20200620.1 global branch merge.current-20200620.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'development/gcc5/patches/glibc2.28-ustat.diff')
-rw-r--r-- | development/gcc5/patches/glibc2.28-ustat.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/development/gcc5/patches/glibc2.28-ustat.diff b/development/gcc5/patches/glibc2.28-ustat.diff new file mode 100644 index 0000000000..c7d71d0677 --- /dev/null +++ b/development/gcc5/patches/glibc2.28-ustat.diff @@ -0,0 +1,31 @@ +--- 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 |