Fix compilation of sanitizers on Linux

Dunno why it's necessary, but seems not bad? Who knows!
rust-lang · Jan 25, 2018 · dfd960b · dfd960b
1 parent bd2cfdd
commit dfd960b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
@@ -655,12 +655,8 @@ u32 GetNumberOfCPUs() {
   }
   internal_close(fd);
   return n_cpus;
-#elif SANITIZER_SOLARIS
-  return sysconf(_SC_NPROCESSORS_ONLN);
 #else
-  cpu_set_t CPUs;
-  CHECK_EQ(sched_getaffinity(0, sizeof(cpu_set_t), &CPUs), 0);
-  return CPU_COUNT(&CPUs);
+  return sysconf(_SC_NPROCESSORS_ONLN);
 #endif
 }
 

diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -137,6 +137,7 @@ typedef struct user_fpregs elf_fpregset_t;
 #endif
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
+#include <stdio.h>
 #include <glob.h>
 #include <obstack.h>
 #include <mqueue.h>