summaryrefslogtreecommitdiff
path: root/libsanitizer
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-19 08:39:27 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-19 08:39:27 +0000
commitb392d6822ad9a345224cb5db9c6a5234173a6c3f (patch)
treee6ae13f1b37739869cd02dd58940609d95d180e3 /libsanitizer
parent5902962e0c2b64a041707d3d3b96ef44ff39dcf3 (diff)
downloadgcc-b392d6822ad9a345224cb5db9c6a5234173a6c3f.tar.gz
PR sanitizer/64435
* sanitizer_common/sanitizer_platform_limits_posix.cc: Cherry pick upstream r223925. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219833 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
-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 ab22345b113..3de7396f854 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 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);