Fallback in libsanitizer for scudo sanitizer (PR sanitizer/87892).

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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@265950 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 705e7ca1c8ef8afcd915f9f9e5816f11cabd2449..55d5a9bf56a278d0a0cb973adadc079085c4522f 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2018-11-08  Bill Seurer  <seurer@linux.vnet.ibm.com>
 
        * 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 32f335eaf23dabcb0dd632054cdfa31f85a0dbab..28360f5656a78cdad5fd1c96d268ff13a7cd4bb4 100644 (file)
--- 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
 }