From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 19 Jan 2015 08:39:27 +0000 (+0100)
Subject: re PR sanitizer/64435 (Bootstrap failure in libsanitizer on AArch64 with Linux kernel... 
X-Git-Tag: upstream/12.2.0~57300
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9deaf59d1b60b7738f848ecd99171d16e99438ae;p=platform%2Fupstream%2Fgcc.git

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
---

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);