Bläddra i källkod

fix compile error when LDSO_RUNPATH_OF_EXECUTABLE is set

Waldemar Brodkorb 9 år sedan
förälder
incheckning
fe10971743
1 ändrade filer med 3 tillägg och 3 borttagningar
  1. 3 3
      ldso/ldso/dl-elf.c

+ 3 - 3
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