From c3d77f3add93300df9893709111089f2a9650e83 Mon Sep 17 00:00:00 2001 From: Peter Bergner Date: Wed, 13 Nov 2013 16:34:33 -0600 Subject: [PATCH] re PR sanitizer/59009 (libsanitizer merge from upstream r191666 breaks bootstrap on powerpc64-linux and aarch64-linux) PR sanitizer/59009 * sanitizer_common/sanitizer_platform_limits_posix.cc: Temporarily ifdef out more source. From-SVN: r204757 --- libsanitizer/ChangeLog | 6 ++++++ .../sanitizer_common/sanitizer_platform_limits_posix.cc | 2 ++ 2 files changed, 8 insertions(+) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index a7be6e6745e..47f93db4e7d 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2013-11-13 Peter Bergner + + PR sanitizer/59009 + * sanitizer_common/sanitizer_platform_limits_posix.cc: Temporarily + ifdef out more source. + 2013-11-12 Jakub Jelinek * sanitizer_common/sanitizer_platform_limits_linux.cc: Temporarily diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc index b771583d064..950ab58cca5 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -855,6 +855,7 @@ CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_flags); CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_restorer); #endif +#ifdef SYSCALL_INTERCEPTION #if SANITIZER_LINUX CHECK_TYPE_SIZE(__sysctl_args); CHECK_SIZE_AND_OFFSET(__sysctl_args, name); @@ -872,6 +873,7 @@ CHECK_TYPE_SIZE(__kernel_off_t); CHECK_TYPE_SIZE(__kernel_loff_t); CHECK_TYPE_SIZE(__kernel_fd_set); #endif +#endif #if !SANITIZER_ANDROID CHECK_TYPE_SIZE(wordexp_t);