summaryrefslogtreecommitdiff
path: root/linker/linker.cpp
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2015-12-11 14:22:24 -0800
committerDimitry Ivanov <dimitry@google.com>2015-12-16 15:24:13 -0800
commit9cf99cbad89c8495828788ce693a99ced434f66f (patch)
treefa089662db2475f6e4e1260f029fcab805eb0a96 /linker/linker.cpp
parentd3e5301a75256171199b23f6ba2c6651d05ce5f1 (diff)
linker: add dlvsym(3)
This changes implements dlvsym - dlsym for versioned symbols. Bug: http://b/22865643 Change-Id: Ic90a60d512104261a1416c43f9100f0d88e3b46f
Diffstat (limited to 'linker/linker.cpp')
-rw-r--r--linker/linker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 99152ed9d..e38e2523c 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -2187,7 +2187,7 @@ static std::string symbol_display_name(const char* sym_name, const char* sym_ver
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 @@ bool do_dlsym(void* handle, const char* sym_name, const char* sym_ver,
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;
}