Commit e1af1b05 authored by Igor Sugak's avatar Igor Sugak Committed by Facebook Github Bot

disable VDSO getcpu optimization in MSAN build mode

Reviewed By: yfeldblum

Differential Revision: D19359860

fbshipit-source-id: b084d8cd603238e76d61de1eed3f233cf5b7fb27
parent 800e1f62
...@@ -296,7 +296,7 @@ CacheLocality CacheLocality::uniform(size_t numCpus) { ...@@ -296,7 +296,7 @@ CacheLocality CacheLocality::uniform(size_t numCpus) {
////////////// Getcpu ////////////// Getcpu
Getcpu::Func Getcpu::resolveVdsoFunc() { Getcpu::Func Getcpu::resolveVdsoFunc() {
#if !FOLLY_HAVE_LINUX_VDSO #if !defined(FOLLY_HAVE_LINUX_VDSO) || defined(FOLLY_SANITIZE_MEMORY)
return nullptr; return nullptr;
#else #else
void* h = dlopen("linux-vdso.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); void* h = dlopen("linux-vdso.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD);
......
...@@ -1033,7 +1033,7 @@ TEST(CacheLocality, BenchmarkSysfs) { ...@@ -1033,7 +1033,7 @@ TEST(CacheLocality, BenchmarkSysfs) {
} }
#endif #endif
#if FOLLY_HAVE_LINUX_VDSO #if defined(FOLLY_HAVE_LINUX_VDSO) && !defined(FOLLY_SANITIZE_MEMORY)
TEST(Getcpu, VdsoGetcpu) { TEST(Getcpu, VdsoGetcpu) {
unsigned cpu; unsigned cpu;
Getcpu::resolveVdsoFunc()(&cpu, nullptr, nullptr); Getcpu::resolveVdsoFunc()(&cpu, nullptr, nullptr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment