commit 0da25235703e8f382c7b9c5e606b84dd7a55711e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 16 23:34:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 16 23:34:35 2018 +0000
tree 62c471a331c367c3fc4a4cea68674ae19e00d09f
parent e2d6c1e76cdb1a8cb00c4bd11466f4c4b350b03a
parent 4e6bf9e9fa745228fa46b93272eee18d3a22a0d9

Merge "Remove obsolete debuggerd32/debuggerd64 hack."

tests/dlfcn_test.cpp

diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index 000d1f7..fb05cd3 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -256,7 +256,12 @@
     return;
   }
 #endif
-  void* handle = dlopen("linux-vdso.so.1", RTLD_NOW);
+
+  const char* vdso_name = "linux-vdso.so.1";
+#if defined(__i386__)
+  vdso_name = "linux-gate.so.1";
+#endif
+  void* handle = dlopen(vdso_name, RTLD_NOW);
   ASSERT_TRUE(handle != nullptr) << dlerror();
   dlclose(handle);
 }