[uClibc-cvs] CVS uClibc/utils
CVS User andersen
andersen at codepoet.org
Sun Oct 3 07:52:07 UTC 2004
Update of /var/cvs/uClibc/utils
In directory nail:/tmp/cvs-serv4061/utils
Modified Files:
Makefile ldconfig.c ldd.c
Log Message:
This patch from Mike Frysinger, extended from an earlier patch from Peter S.
Mazinger implements the changes suggested by me on the uclibc list.
On Tuesday 28 September 2004 02:24 pm, Erik Andersen wrote:
> What I think should be done is
>
> *) Someone that cares about USE_CACHE should fix that option
> up to be sure it works, and give it a proper config entry
> in extra/Configs/Config.in, and rename it to something
> more appropriate such as LDSO_CACHE_SUPPORT.
>
> *) When LDSO_CACHE_SUPPORT=n, UCLIBC_RUNTIME_PREFIX /usr/X11R6/lib
> should be included in the default library search path in
> dl-elf.c, ldd, and ldconfig.
>
> *) When LDSO_CACHE_SUPPORT=y, UCLIBC_RUNTIME_PREFIX /usr/X11R6/lib
> should be excluded from the default library search path in
> dl-elf.c, ldd, and ldconfig, and those wishing to include
> X11 stuff should add that into /etc/ld.so.conf and re-run
> ldconfig.
>
> *) At present, LDSO_CONF and LDSO_CACHE use the same names
> and same structure as glibc. This precludes
> LDSO_CACHE_SUPPORT being uses in any sane fashion on a
> dial glibc and uClibc system. Just as it was necessary
> for use to use a different name for 'libuClibc' rather
> than 'libc', and 'ld-uClibc.so.0' rather than
> 'ld-linux.so.2' it seems that these configuration files
> really ought to be given different names.
>
--- /var/cvs/uClibc/utils/Makefile 2004/08/10 08:58:12 1.13
+++ /var/cvs/uClibc/utils/Makefile 2004/10/03 07:52:05 1.14
@@ -29,7 +29,7 @@
TARGET_ICONV =
endif
-XXFLAGS=$(LIBRARY_CACHE)
+XXFLAGS=
ifeq ($(strip $(LDSO_LDD_SUPPORT)),y)
XXFLAGS+= -D__LDSO_LDD_SUPPORT
endif
--- /var/cvs/uClibc/utils/ldconfig.c 2004/09/27 09:40:55 1.4
+++ /var/cvs/uClibc/utils/ldconfig.c 2004/10/03 07:52:05 1.5
@@ -503,7 +503,7 @@
{
if (!lp->islink)
link_shlib(name, lp->name, lp->so);
-#ifdef USE_CACHE
+#ifdef __LDSO_CACHE_SUPPORT__
if (!nocache)
cache_dolib(name, lp->so, lp->libtype);
#endif
@@ -553,7 +553,7 @@
return res;
}
-#ifdef USE_CACHE
+#ifdef __LDSO_CACHE_SUPPORT__
typedef struct liblist
{
int flags;
@@ -876,6 +876,9 @@
{
scan_dir(UCLIBC_RUNTIME_PREFIX "lib");
scan_dir(UCLIBC_RUNTIME_PREFIX "usr/lib");
+#if !defined (__LDSO_CACHE_SUPPORT__)
+ scan_dir(UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib");
+#endif
/* I guess the defaults aren't good enough */
if ((extpath = get_extpath()))
@@ -886,8 +889,12 @@
if (len)
while (cp[--len] == '/' && len)
cp[len] = 0;
- if (strcmp(UCLIBC_RUNTIME_PREFIX "lib", cp) == 0 ||
- strcmp(UCLIBC_RUNTIME_PREFIX "usr/lib", cp) == 0) {
+ if (strcmp(UCLIBC_RUNTIME_PREFIX "lib", cp) == 0
+ || strcmp(UCLIBC_RUNTIME_PREFIX "usr/lib", cp) == 0
+#if !defined (__LDSO_CACHE_SUPPORT__)
+ || strcmp(UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib", cp) == 0
+#endif
+ ) {
if (verbose >= 0)
warnx("Path `%s' given more than once\n", cp);
continue;
@@ -898,7 +905,7 @@
}
}
-#ifdef USE_CACHE
+#ifdef __LDSO_CACHE_SUPPORT__
if (!nocache)
cache_write();
#endif
--- /var/cvs/uClibc/utils/ldd.c 2004/09/28 08:55:06 1.16
+++ /var/cvs/uClibc/utils/ldd.c 2004/10/03 07:52:05 1.17
@@ -45,6 +45,7 @@
#else
#include "elf.h"
#endif
+#include "dl-cache.h"
#ifdef DMALLOC
#include <dmalloc.h>
@@ -229,6 +230,89 @@
return 0;
}
+#ifdef __LDSO_CACHE_SUPPORT__
+static caddr_t cache_addr = NULL;
+static size_t cache_size = 0;
+
+int map_cache(void)
+{
+ int fd;
+ struct stat st;
+ header_t *header;
+ libentry_t *libent;
+ int i, strtabsize;
+
+ if (cache_addr == (caddr_t) - 1)
+ return -1;
+ else if (cache_addr != NULL)
+ return 0;
+
+ if (stat(LDSO_CACHE, &st)
+ || (fd = open(LDSO_CACHE, O_RDONLY, 0)) < 0) {
+ dprintf(2, "ldd: can't open cache '%s'\n", LDSO_CACHE);
+ cache_addr = (caddr_t) - 1; /* so we won't try again */
+ return -1;
+ }
+
+ cache_size = st.st_size;
+ cache_addr = (caddr_t) mmap(0, cache_size, PROT_READ, MAP_SHARED, fd, 0);
+ close(fd);
+ if (cache_addr == MAP_FAILED) {
+ dprintf(2, "ldd: can't map cache '%s'\n", LDSO_CACHE);
+ return -1;
+ }
+
+ header = (header_t *) cache_addr;
+
+ if (cache_size < sizeof(header_t) ||
+ memcmp(header->magic, LDSO_CACHE_MAGIC, LDSO_CACHE_MAGIC_LEN)
+ || memcmp(header->version, LDSO_CACHE_VER, LDSO_CACHE_VER_LEN)
+ || cache_size <
+ (sizeof(header_t) + header->nlibs * sizeof(libentry_t))
+ || cache_addr[cache_size - 1] != '\0')
+ {
+ dprintf(2, "ldd: cache '%s' is corrupt\n", LDSO_CACHE);
+ goto fail;
+ }
+
+ strtabsize = cache_size - sizeof(header_t) -
+ header->nlibs * sizeof(libentry_t);
+ libent = (libentry_t *) & header[1];
+
+ for (i = 0; i < header->nlibs; i++) {
+ if (libent[i].sooffset >= strtabsize ||
+ libent[i].liboffset >= strtabsize)
+ {
+ dprintf(2, "ldd: cache '%s' is corrupt\n", LDSO_CACHE);
+ goto fail;
+ }
+ }
+
+ return 0;
+
+fail:
+ munmap(cache_addr, cache_size);
+ cache_addr = (caddr_t) - 1;
+ return -1;
+}
+
+int unmap_cache(void)
+{
+ if (cache_addr == NULL || cache_addr == (caddr_t) - 1)
+ return -1;
+
+#if 1
+ munmap(cache_addr, cache_size);
+ cache_addr = NULL;
+#endif
+
+ return 0;
+}
+#else
+static inline void map_cache(void) { }
+static inline void unmap_cache(void) { }
+#endif
+
/* This function's behavior must exactly match that
* in uClibc/ldso/ldso/dl-elf.c */
static void search_for_named_library(char *name, char *result, const char *path_list)
@@ -320,8 +404,23 @@
}
}
-#ifdef USE_CACHE
- /* FIXME -- add code to check the Cache here */
+#ifdef __LDSO_CACHE_SUPPORT__
+ if (cache_addr != NULL && cache_addr != (caddr_t) - 1) {
+ int i;
+ header_t *header = (header_t *) cache_addr;
+ libentry_t *libent = (libentry_t *) & header[1];
+ char *strs = (char *) &libent[header->nlibs];
+
+ for (i = 0; i < header->nlibs; i++) {
+ if ((libent[i].flags == LIB_ELF ||
+ libent[i].flags == LIB_ELF_LIBC0 ||
+ libent[i].flags == LIB_ELF_LIBC5) &&
+ strcmp(lib->name, strs + libent[i].sooffset) == 0) {
+ lib->path = strdup(strs + libent[i].liboffset);
+ return;
+ }
+ }
+ }
#endif
@@ -339,7 +438,11 @@
/* Lastly, search the standard list of paths for the library.
This list must exactly match the list in uClibc/ldso/ldso/dl-elf.c */
path = UCLIBC_RUNTIME_PREFIX "lib:"
- UCLIBC_RUNTIME_PREFIX "usr/lib";
+ UCLIBC_RUNTIME_PREFIX "usr/lib"
+#if !defined (__LDSO_CACHE_SUPPORT__)
+ ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
+#endif
+ ;
search_for_named_library(lib->name, buf, path);
if (*buf != '\0') {
lib->path = buf;
@@ -644,6 +747,8 @@
printf("%s:\n", *argv);
}
+ map_cache();
+
if (find_dependancies(filename)!=0)
continue;
@@ -660,6 +765,7 @@
}
}
+ unmap_cache();
/* Print the list */
got_em_all=0;
More information about the uClibc-cvs
mailing list