From fe109717435b9e62e24579559b3bf521d047d453 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Apr 2015 07:34:36 +0200 Subject: fix compile error when LDSO_RUNPATH_OF_EXECUTABLE is set --- 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 49b516390..01b29da29 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 -- cgit v1.2.3