diff --git a/js/src/vm/Stopwatch.cpp b/js/src/vm/Stopwatch.cpp index 7c6c9e0f0268..989a08b0554a 100644 --- a/js/src/vm/Stopwatch.cpp +++ b/js/src/vm/Stopwatch.cpp @@ -417,11 +417,9 @@ AutoStopwatch::getCPU() const cpuid_t result(proc.Group, proc.Number); return result; -#elif defined(__GLIBC__) - return sched_getcpu(); #else return {}; -#endif // defined(XP_WIN) || defined(__GLIBC__) +#endif // defined(XP_WIN) } bool inline @@ -429,8 +427,6 @@ AutoStopwatch::isSameCPU(const cpuid_t& a, const cpuid_t& b) const { #if defined(XP_WIN) && WINVER >= _WIN32_WINNT_VISTA return a.group_ == b.group_ && a.number_ == b.number_; -#elif defined(__GLIBC__) - return a == b; #else return true; #endif diff --git a/js/src/vm/Stopwatch.h b/js/src/vm/Stopwatch.h index 0cfb453c4bf2..ad8322b32647 100644 --- a/js/src/vm/Stopwatch.h +++ b/js/src/vm/Stopwatch.h @@ -314,11 +314,9 @@ struct cpuid_t { number_(0) { } }; -#elif defined(__linux__) - typedef int cpuid_t; #else typedef struct {} cpuid_t; -#endif // defined(WINVER >= 0x0600) || defined(__linux__) +#endif // defined(WINVER >= 0x0600) /** * RAII class to start/stop measuring performance when