OSDN Git Service

fix compile error when LDSO_RUNPATH_OF_EXECUTABLE is set
authorWaldemar Brodkorb <wbx@uclibc-ng.org>
Mon, 13 Apr 2015 05:34:36 +0000 (07:34 +0200)
committerWaldemar Brodkorb <wbx@uclibc-ng.org>
Mon, 13 Apr 2015 05:35:38 +0000 (07:35 +0200)
ldso/ldso/dl-elf.c

index 49b5163..01b29da 100644 (file)
@@ -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