[uClibc-cvs] CVS uClibc/ldso/include
CVS User jocke
jocke at codepoet.org
Wed Oct 6 07:34:15 UTC 2004
Update of /var/cvs/uClibc/ldso/include
In directory nail:/tmp/cvs-serv15810/ldso/include
Modified Files:
dl-elf.h
Added Files:
dl-defs.h
Log Message:
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.
--- /var/cvs/uClibc/ldso/include/dl-elf.h 2004/10/03 07:51:59 1.15
+++ /var/cvs/uClibc/ldso/include/dl-elf.h 2004/10/06 07:34:14 1.16
@@ -5,47 +5,14 @@
#include <elf.h>
#include <link.h>
-#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
-
/* Forward declarations for stuff defined in ld_hash.h */
struct dyn_elf;
struct elf_resolve;
-
-/* Definitions and prototypes for cache stuff */
+#include <dl-defs.h>
#ifdef __LDSO_CACHE_SUPPORT__
extern int _dl_map_cache(void);
extern int _dl_unmap_cache(void);
-
-#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;
-
#else
static inline void _dl_map_cache(void) { }
static inline void _dl_unmap_cache(void) { }
More information about the uClibc-cvs
mailing list