diff options
Diffstat (limited to 'ldso/util')
| -rw-r--r-- | ldso/util/Makefile | 29 | ||||
| -rw-r--r-- | ldso/util/ldconfig.c | 6 | ||||
| -rw-r--r-- | ldso/util/ldd.c | 11 |
3 files changed, 16 insertions, 30 deletions
diff --git a/ldso/util/Makefile b/ldso/util/Makefile index ac720f64f..0d0c96845 100644 --- a/ldso/util/Makefile +++ b/ldso/util/Makefile @@ -53,43 +53,30 @@ readsoname.o: readsoname.c readsoname2.c $(HOSTCC) $(HOSTCFLAGS) -I. -I../include -c $< -o $@ strip -x -R .note -R .comment $*.o -#ldconfig.o: ldconfig.c -# $(HOSTCC) $(HOSTCFLAGS) -I. -I../include \ -# -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" -c $< -o $@ -# strip -x -R .note -R .comment $*.o - -#ldconfig: ldconfig.o readsoname.o -# $(HOSTCC) $(HOSTCFLAGS) $^ -o $@ -# strip -x -R .note -R .comment $@ - ldconfig: ldconfig.c readsoname.c - $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ - -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ - -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \ + $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) \ + -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -I. -I../include \ $^ -o $@ strip -x -R .note -R .comment $@ ldconfig.target: ldconfig.c readsoname.c - $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ - -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ - -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \ + $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s \ + -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -I. -I../include \ $^ -o $@ $(LDADD_LIBFLOAT) $(STRIPTOOL) -x -R .note -R .comment $@ ldd: ldd.c - $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ - -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ - -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \ + $(HOSTCC) $(HOSTCFLAGS) $(XXFLAGS) \ + -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -I. -I../include \ $^ -o $@ strip -x -R .note -R .comment $@ ldd.target: ldd.c - $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ - -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ - -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \ + $(TARGET_CC) $(CFLAGS) $(XXFLAGS) -Wl,-s \ + -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \ $^ -o $@ $(LDADD_LIBFLOAT) $(STRIPTOOL) -x -R .note -R .comment $@ diff --git a/ldso/util/ldconfig.c b/ldso/util/ldconfig.c index 8ae28da77..0b6890ff1 100644 --- a/ldso/util/ldconfig.c +++ b/ldso/util/ldconfig.c @@ -885,9 +885,9 @@ int main(int argc, char **argv) free(extpath); } - scan_dir(UCLIBC_TARGET_PREFIX "/usr/X11R6/lib"); - scan_dir(UCLIBC_TARGET_PREFIX "/usr/lib"); - scan_dir(UCLIBC_TARGET_PREFIX "/lib"); + scan_dir(UCLIBC_RUNTIME_PREFIX "/usr/X11R6/lib"); + scan_dir(UCLIBC_RUNTIME_PREFIX "/usr/lib"); + scan_dir(UCLIBC_RUNTIME_PREFIX "/lib"); } #ifdef USE_CACHE diff --git a/ldso/util/ldd.c b/ldso/util/ldd.c index a73d34070..3ea41b424 100644 --- a/ldso/util/ldd.c +++ b/ldso/util/ldd.c @@ -215,7 +215,7 @@ int check_elf_header(Elf32_Ehdr *const ehdr) } /* This function's behavior must exactly match that - * in uClibc/ldso/d-link/readelflib1.c */ + * in uClibc/ldso/ldso/readelflib1.c */ static void search_for_named_library(char *name, char *result, const char *path_list) { int i, count = 1; @@ -322,11 +322,10 @@ void locate_library_file(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_suid, stru } /* Lastly, search the standard list of paths for the library. - This list must exactly match the list in uClibc/ldso/d-link/readelflib1.c */ - path = UCLIBC_TARGET_PREFIX "/usr/lib:" - UCLIBC_TARGET_PREFIX "/lib:" - UCLIBC_DEVEL_PREFIX "/lib:" - UCLIBC_BUILD_DIR "/lib:" + This list must exactly match the list in uClibc/ldso/ldso/readelflib1.c */ + path = UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:" + UCLIBC_RUNTIME_PREFIX "usr/lib:" + UCLIBC_RUNTIME_PREFIX "lib:" "/usr/lib:" "/lib"; search_for_named_library(lib->name, buf, path); |