From 655b57ee7f5c54d09ab6fa7ca9776156ff8a9166 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sun, 18 Nov 2018 08:06:46 +0200
Subject: linker: fix cpp_demangler setting
---
src/linker/linker.c | 2 +-
src/wrapper/wrapper.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/linker/linker.c b/src/linker/linker.c
index bd774a4..e4e9f8a 100644
--- a/src/linker/linker.c
+++ b/src/linker/linker.c
@@ -1274,7 +1274,7 @@ soinfo *apkenv_find_library(const char *name, const bool try_glibc)
if (!(si = apkenv_load_library(name, try_glibc)) || !(si = apkenv_init_library(si)))
return NULL;
- if (!strstr(bname, "libstdc++.so")) {
+ if (!strcmp(bname, "libstdc++.so")) {
Elf32_Sym *sym = apkenv_lookup_in_library(si, "__cxa_demangle");
if (sym && ELF32_ST_BIND(sym->st_info) == STB_GLOBAL && sym->st_shndx != 0)
wrapper_set_cpp_demangler((void*)(intptr_t)(sym->st_value + si->base));
diff --git a/src/wrapper/wrapper.c b/src/wrapper/wrapper.c
index 2767114..5411754 100644
--- a/src/wrapper/wrapper.c
+++ b/src/wrapper/wrapper.c
@@ -90,6 +90,7 @@ wrapper_set_cpp_demangler(void *function)
{
#ifdef WRAPPER_TRACE
__cxa_demangle.ptr = function;
+ verbose_log("wrapper: set cpp_demangler to %p", function);
#endif
}
--
cgit v1.2.3-70-g09d2