From 9f9ab4922338d58f5adf8353286039eae09e1c2f Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Wed, 6 Oct 2004 07:34:17 +0000 Subject: Puts common defines into dl-defs.h (in ldso/include) from dl-elf.h and dl-cache.h and make use of it. Also disables the lib-path-redundancy check for the case the cache is not used. Makes use of _PRELOAD_FILE_SUPPORT. From Peter Mazinger. --- utils/dl-cache.h | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'utils/dl-cache.h') diff --git a/utils/dl-cache.h b/utils/dl-cache.h index ba7cd3f28..e69de29bb 100644 --- a/utils/dl-cache.h +++ b/utils/dl-cache.h @@ -1,34 +0,0 @@ -#define LDSO_BASE_PATH UCLIBC_RUNTIME_PREFIX "etc/" __LDSO_BASE_FILENAME__ -#define LDSO_CONF LDSO_BASE_PATH ".conf" -#define LDSO_CACHE LDSO_BASE_PATH ".cache" -#define LDSO_PRELOAD LDSO_BASE_PATH ".preload" - -#define LIB_ANY -1 -#define LIB_DLL 0 -#define LIB_ELF 1 -#define LIB_ELF64 0x80 -#define LIB_ELF_LIBC5 2 -#define LIB_ELF_LIBC6 3 -#define LIB_ELF_LIBC0 4 - -/* Definitions and prototypes for cache stuff */ -#ifdef __LDSO_CACHE_SUPPORT__ - -#define LDSO_CACHE_MAGIC "ld.so-" -#define LDSO_CACHE_MAGIC_LEN (sizeof LDSO_CACHE_MAGIC -1) -#define LDSO_CACHE_VER "1.7.0" -#define LDSO_CACHE_VER_LEN (sizeof LDSO_CACHE_VER -1) - -typedef struct { - char magic [LDSO_CACHE_MAGIC_LEN]; - char version [LDSO_CACHE_VER_LEN]; - int nlibs; -} header_t; - -typedef struct { - int flags; - int sooffset; - int liboffset; -} libentry_t; - -#endif -- cgit v1.2.3