diff options
| author | Elliott Hughes <enh@google.com> | 2018-02-16 21:51:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-16 21:51:54 +0000 |
| commit | e2d6c1e76cdb1a8cb00c4bd11466f4c4b350b03a (patch) | |
| tree | cebae02340e29719ff51cf0c5e8e96d9e029cfbb | |
| parent | d5172fced0f88114e21086db5defaee64371de32 (diff) | |
| parent | da1bb113408030cebd1b7f2ce4b10b0e1852666d (diff) | |
| download | bionic-e2d6c1e76cdb1a8cb00c4bd11466f4c4b350b03a.tar.gz | |
Merge "The VDSO soname varies by architecture."
| -rw-r--r-- | tests/dlfcn_test.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp index 000d1f7e2..fb05cd301 100644 --- a/tests/dlfcn_test.cpp +++ b/tests/dlfcn_test.cpp @@ -256,7 +256,12 @@ TEST(dlfcn, dlopen_vdso) { 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); } |