Revert libsanitizer patches or fix 59009

[Peter Bergner]

On Wed, 2013-11-13 at 11:25 -0600, Peter Bergner wrote:
> On Wed, 2013-11-13 at 00:49 +0100, Jakub Jelinek wrote:
> > 2013-11-12  Jakub Jelinek  <jakub@redhat.com>
> > 
> > 	* sanitizer_common/sanitizer_platform_limits_linux.cc: Temporarily
> > 	ifdef out almost the whole source.
> > 	* sanitizer_common/sanitizer_common_syscalls.inc: Likewise.
> 
> That helps, but as Pat reported in the bugzilla, it still is failing.
> With the following patch, we can now bootstrap on powerpc64-linux.
> 
> Is this ok for trunk?
> 
> Does this help the other architectures that are failing for the same
> build error?

Ok, Dave reported in PR59009 that my last patch still left a few build
problems on HPPA.  Dave tested the patch below and confirmed this cleans
up the last of his HPPA build issues.  I have confirmed on powerpc64-linux
that there are no libsanitizer testsuite regressions.

Is this ok for trunk?

I left out the mroute6.h change, as even without that being included,
I'm still seeing more related failures on SLES10/RHEL5 builds due to
struct ustat being multiply defined, so I thought we would leave that
change to be included with whatever else I need to get the build to
work on older systems.

Peter


	PR sanitizer/59009
	* sanitizer_common/sanitizer_platform_limits_posix.cc: Temporarily
	ifdef out more interceptor source to fix HPPA build.

Index: libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
===================================================================
--- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc	(revision 204841)
+++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc	(working copy)
@@ -846,6 +846,7 @@ CHECK_TYPE_SIZE(nfds_t);

 CHECK_TYPE_SIZE(sigset_t);

+#ifdef SYSCALL_INTERCEPTION
 COMPILER_CHECK(sizeof(__sanitizer_sigaction) == sizeof(struct sigaction));
 // Can't write checks for sa_handler and sa_sigaction due to them being
 // preprocessor macros.
@@ -855,7 +856,6 @@ CHECK_STRUCT_SIZE_AND_OFFSET(sigaction,
 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);