aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2015-01-19 09:39:27 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2015-01-19 09:39:27 +0100
commit9deaf59d1b60b7738f848ecd99171d16e99438ae (patch)
treee6ae13f1b37739869cd02dd58940609d95d180e3
parent2f3b40a7302be02c6eb99e1b13ba6b9591890e3f (diff)
downloadgcc-9deaf59d1b60b7738f848ecd99171d16e99438ae.zip
gcc-9deaf59d1b60b7738f848ecd99171d16e99438ae.tar.gz
gcc-9deaf59d1b60b7738f848ecd99171d16e99438ae.tar.bz2
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
-rw-r--r--libsanitizer/ChangeLog6
-rw-r--r--libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc4
2 files changed, 10 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index ab22345..3de7396 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-19 Jakub Jelinek <jakub@redhat.com>
+
+ PR sanitizer/64435
+ * sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry pick
+ upstream r223925.
+
2015-01-13 Jakub Jelinek <jakub@redhat.com>
* 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 13d908e9..7ea8706 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);