commit 9cf99cbad89c8495828788ce693a99ced434f66f
author Dimitry Ivanov <dimitry@google.com> Fri Dec 11 14:22:24 2015 -0800
committer Dimitry Ivanov <dimitry@google.com> Wed Dec 16 15:24:13 2015 -0800
tree fa089662db2475f6e4e1260f029fcab805eb0a96
parent d3e5301a75256171199b23f6ba2c6651d05ce5f1

linker: add dlvsym(3)

This changes implements dlvsym - dlsym for versioned symbols.

Bug: http://b/22865643
Change-Id: Ic90a60d512104261a1416c43f9100f0d88e3b46f

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 99152ed..e38e252 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2187,7 +2187,7 @@
     return sym_name;
   }
 
-  return std::string(sym_name) + "@" + sym_ver;
+  return std::string(sym_name) + ", version " + sym_ver;
 }
 
 void do_android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size) {
@@ -2312,8 +2312,8 @@
   version_info* vi = nullptr;
 
   if (sym_ver != nullptr) {
-    vi_instance.name = sym_name;
-    vi_instance.elf_hash = calculate_elf_hash(sym_name);
+    vi_instance.name = sym_ver;
+    vi_instance.elf_hash = calculate_elf_hash(sym_ver);
     vi = &vi_instance;
   }