[PATCH] Revert libsanitizer r318802 as we don't use Scudo allocator (PR sanitizer/87892).

Jakub Jelinek jakub@redhat.com
Fri Nov 9 09:14:00 GMT 2018


On Fri, Nov 09, 2018 at 10:12:32AM +0100, Martin Liška wrote:
> Ok, then I'm going to install following patch.

Thanks.

> 2018-11-09  Martin Liska  <mliska@suse.cz>
> 
> 	PR sanitizer/87892
> 	* sanitizer_common/sanitizer_linux_libcdep.cc (defined): Return
> 	1 when CPU_COUNT macro is not defined.
> ---
>  libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
> index 32f335eaf23..28360f5656a 100644
> --- a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
> +++ b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
> @@ -694,9 +694,13 @@ u32 GetNumberOfCPUs() {
>  #elif SANITIZER_SOLARIS
>    return sysconf(_SC_NPROCESSORS_ONLN);
>  #else
> +#if defined(CPU_COUNT)
>    cpu_set_t CPUs;
>    CHECK_EQ(sched_getaffinity(0, sizeof(cpu_set_t), &CPUs), 0);
>    return CPU_COUNT(&CPUs);
> +#else
> +  return 1;
> +#endif
>  #endif
>  }
>  
> -- 
> 2.19.1
> 

	Jakub



More information about the Gcc-patches mailing list