re PR sanitizer/59009 (libsanitizer merge from upstream r191666 breaks bootstrap...

	PR sanitizer/59009
	* sanitizer_common/sanitizer_platform_limits_posix.cc: Temporarily
	ifdef out more source.

From-SVN: r204757

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index a7be6e6745e002b8350c5d2ca96d266e6a7bb3ed..47f93db4e7d01b7a84426f4f708ac5cb1d0347e5 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-13  Peter Bergner  <bergner@vnet.ibm.com>
+
+       PR sanitizer/59009
+       * sanitizer_common/sanitizer_platform_limits_posix.cc: Temporarily
+       ifdef out more source.
+
 2013-11-12  Jakub Jelinek  <jakub@redhat.com>
 
        * 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 b771583d0640afbe97a7f07901bd839d3e3d7848..950ab58cca5e95d57958a6badce65fec29538c7f 100644 (file)
--- 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);