From: Martin Liska Date: Fri, 9 Nov 2018 09:14:36 +0000 (+0100) Subject: Fallback in libsanitizer for scudo sanitizer (PR sanitizer/87892). X-Git-Tag: basepoints/gcc-10~3205 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e2e13c4218a23152410e1a44218102d2e196e8;p=thirdparty%2Fgcc.git Fallback in libsanitizer for scudo sanitizer (PR sanitizer/87892). 2018-11-09 Martin Liska PR sanitizer/87892 * sanitizer_common/sanitizer_linux_libcdep.cc (defined): Return 1 when CPU_COUNT macro is not defined. From-SVN: r265950 --- diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 705e7ca1c8ef..55d5a9bf56a2 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2018-11-09 Martin Liska + + PR sanitizer/87892 + * sanitizer_common/sanitizer_linux_libcdep.cc (defined): Return + 1 when CPU_COUNT macro is not defined. + 2018-11-08 Bill Seurer * libsanitizer/sanitizer_common/sanitizer_linux.cc (CheckASLR): diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc index 32f335eaf23d..28360f5656a7 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 }