This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "uClibc-ng - small C library for embedded systems". The branch, 1.0 has been updated via dd64f5afc19274f4e92afde3d13d1e8f0d2ee2d5 (commit) via fe109717435b9e62e24579559b3bf521d047d453 (commit) from a500a54bedc8081b9959cb03214047aead18b164 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dd64f5afc19274f4e92afde3d13d1e8f0d2ee2d5 Merge: fe10971 a500a54 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Mon Apr 13 07:34:57 2015 +0200 Merge branch '1.0' of git+ssh://uclibc-ng.org/git/uclibc-ng into 1.0 commit fe109717435b9e62e24579559b3bf521d047d453 Author: Waldemar Brodkorb <wbx(a)uclibc-ng.org> Date: Mon Apr 13 07:34:36 2015 +0200 fix compile error when LDSO_RUNPATH_OF_EXECUTABLE is set ----------------------------------------------------------------------- Summary of changes: ldso/ldso/dl-elf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 49b5163..01b29da 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -274,7 +274,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp if (pnt) { pnt += (unsigned long) _dl_loaded_modules->dynamic_info[DT_STRTAB]; _dl_if_debug_dprint("\tsearching exe's RPATH='%s'\n", pnt); - if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL) + if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL) return tpnt1; } #endif @@ -345,14 +345,14 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp if (pnt) { pnt += (unsigned long) _dl_loaded_modules->dynamic_info[DT_STRTAB]; _dl_if_debug_dprint("\tsearching exe's RUNPATH='%s'\n", pnt); - if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL) + if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL) return tpnt1; } pnt = (char *) _dl_loaded_modules->dynamic_info[DT_RPATH]; if (pnt) { pnt += (unsigned long) _dl_loaded_modules->dynamic_info[DT_STRTAB]; _dl_if_debug_dprint("\tsearching exe's RPATH='%s'\n", pnt); - if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL) + if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL) return tpnt1; } #endif hooks/post-receive -- uClibc-ng - small C library for embedded systems