aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer
diff options
context:
space:
mode:
authorPeter Bergner <bergner@vnet.ibm.com>2013-11-13 16:34:33 -0600
committerPeter Bergner <bergner@gcc.gnu.org>2013-11-13 16:34:33 -0600
commitc3d77f3add93300df9893709111089f2a9650e83 (patch)
tree43b339a1d46650f9cd1ed483d87fb3c57512b85d /libsanitizer
parent4c7d077736ff597d1fbe50dd42364ea744964d60 (diff)
downloadgcc-c3d77f3add93300df9893709111089f2a9650e83.zip
gcc-c3d77f3add93300df9893709111089f2a9650e83.tar.gz
gcc-c3d77f3add93300df9893709111089f2a9650e83.tar.bz2
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
Diffstat (limited to 'libsanitizer')
-rw-r--r--libsanitizer/ChangeLog6
-rw-r--r--libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc2
2 files changed, 8 insertions, 0 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index a7be6e6..47f93db 100644
--- 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 b771583..950ab58 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);