From 9deaf59d1b60b7738f848ecd99171d16e99438ae Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 19 Jan 2015 09:39:27 +0100 Subject: [PATCH] re PR sanitizer/64435 (Bootstrap failure in libsanitizer on AArch64 with Linux kernel <= 3.15) PR sanitizer/64435 * sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry pick upstream r223925. From-SVN: r219833 --- libsanitizer/ChangeLog | 6 ++++++ .../sanitizer_common/sanitizer_platform_limits_posix.cc | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index ab22345b113..3de7396f854 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2015-01-19 Jakub Jelinek + + PR sanitizer/64435 + * sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry pick + upstream r223925. + 2015-01-13 Jakub Jelinek * sanitizer_common/sanitizer_deadlock_detector.h: Cherry pick diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc index 13d908e9f8c..7ea8706dfc6 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -1003,8 +1003,12 @@ CHECK_SIZE_AND_OFFSET(__sysctl_args, newlen); CHECK_TYPE_SIZE(__kernel_uid_t); CHECK_TYPE_SIZE(__kernel_gid_t); + +#if !defined(__aarch64__) CHECK_TYPE_SIZE(__kernel_old_uid_t); CHECK_TYPE_SIZE(__kernel_old_gid_t); +#endif + CHECK_TYPE_SIZE(__kernel_off_t); CHECK_TYPE_SIZE(__kernel_loff_t); CHECK_TYPE_SIZE(__kernel_fd_set); -- 2.30.2