[uclibc-ng-devel] uClibc-ng - small C library for embedded systems branch master updated. b10092278c5c6f14bebb3cf277de4d41c4148062

wbx wbx at helium.waldemar-brodkorb.de
Mon Apr 13 07:35:42 CEST 2015


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, master has been updated
       via  b10092278c5c6f14bebb3cf277de4d41c4148062 (commit)
      from  b8b8c7e98741791a6cfda3720788aed85c9ae410 (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 b10092278c5c6f14bebb3cf277de4d41c4148062
Author: Waldemar Brodkorb <wbx at 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


More information about the devel mailing list