aboutsummaryrefslogtreecommitdiffstats
path: root/main/libc0.9.32/uclibc-rtld_next-fix.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-11-02 08:51:11 +0200
committerTimo Teräs <timo.teras@iki.fi>2012-11-02 08:51:11 +0200
commitd6df4153c8ef0bdc3b380151d954a94a123dc4dc (patch)
tree941f0dafdceae87cd647a614fe6fc37ab8e9d48e /main/libc0.9.32/uclibc-rtld_next-fix.patch
parent6954a3429933a6c8aa7110f5a11649ecf048d2c7 (diff)
downloadaports-d6df4153c8ef0bdc3b380151d954a94a123dc4dc.tar.bz2
aports-d6df4153c8ef0bdc3b380151d954a94a123dc4dc.tar.xz
main/libc0.9.32: missing file for dlsym(RTLD_NEXT) patch
Diffstat (limited to 'main/libc0.9.32/uclibc-rtld_next-fix.patch')
-rw-r--r--main/libc0.9.32/uclibc-rtld_next-fix.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/main/libc0.9.32/uclibc-rtld_next-fix.patch b/main/libc0.9.32/uclibc-rtld_next-fix.patch
new file mode 100644
index 0000000000..f952641f47
--- /dev/null
+++ b/main/libc0.9.32/uclibc-rtld_next-fix.patch
@@ -0,0 +1,27 @@
+--- a/ldso/libdl/libdl.c
++++ b/ldso/libdl/libdl.c
+@@ -671,7 +671,7 @@
+ {
+ struct elf_resolve *tpnt, *tfrom;
+ struct dyn_elf *handle;
+- ElfW(Addr) from;
++ ElfW(Addr) from = 0;
+ struct dyn_elf *rpnt;
+ void *ret;
+ struct symbol_ref sym_ref = { NULL, NULL };
+@@ -729,7 +729,13 @@
+ tpnt = NULL;
+ if (handle == _dl_symbol_tables)
+ tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
+- ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++
++ do {
++ ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
++ if (ret != NULL)
++ break;
++ handle = handle->next;
++ } while (from && handle);
+
+ #if defined(USE_TLS) && USE_TLS && defined SHARED
+ if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {
+