diff options
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/include/dl-elf.h | 15 | ||||
| -rw-r--r-- | ldso/ldso/Makefile | 2 | ||||
| -rw-r--r-- | ldso/ldso/dl-elf.c | 7 | ||||
| -rw-r--r-- | ldso/libdl/Makefile | 2 | ||||
| -rw-r--r-- | ldso/libdl/libdl.c | 2 |
5 files changed, 13 insertions, 15 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index f1213d1b3..5a6e56c80 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -5,15 +5,10 @@ #include <elf.h> #include <link.h> -#ifdef DEBUG -# define LDSO_CONF "../util/ld.so.conf" -# define LDSO_CACHE "../util/ld.so.cache" -# define LDSO_PRELOAD "../util/ld.so.preload" -#else -# define LDSO_CONF UCLIBC_RUNTIME_PREFIX "etc/ld.so.conf" -# define LDSO_CACHE UCLIBC_RUNTIME_PREFIX "etc/ld.so.cache" -# define LDSO_PRELOAD UCLIBC_RUNTIME_PREFIX "etc/ld.so.preload" -#endif +#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 @@ -30,7 +25,7 @@ struct elf_resolve; /* Definitions and prototypes for cache stuff */ -#ifdef USE_CACHE +#ifdef __LDSO_CACHE_SUPPORT__ extern int _dl_map_cache(void); extern int _dl_unmap_cache(void); diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 90f44baa8..4196748f9 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -23,7 +23,7 @@ LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so SSPFLAGS=$(call check_gcc,-fno-stack-protector,) -XXFLAGS=$(XWARNINGS) $(LIBRARY_CACHE) $(SSPFLAGS) +XXFLAGS=$(XWARNINGS) $(SSPFLAGS) ifeq ($(DODEBUG),y) # Not really much point in including debugging info, since gdb # can't really debug ldso, since gdb requires help from ldso to diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 019acaac8..0719680e9 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -32,7 +32,7 @@ #include "ldso.h" -#ifdef USE_CACHE +#ifdef __LDSO_CACHE_SUPPORT__ static caddr_t _dl_cache_addr = NULL; static size_t _dl_cache_size = 0; @@ -317,7 +317,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, * ABI, so we have some flexibility here. For now, search it before * the hard coded paths that follow (i.e before /lib and /usr/lib). */ -#ifdef USE_CACHE +#ifdef __LDSO_CACHE_SUPPORT__ if (_dl_cache_addr != NULL && _dl_cache_addr != (caddr_t) - 1) { int i; header_t *header = (header_t *) _dl_cache_addr; @@ -358,6 +358,9 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt, if ((tpnt1 = search_for_named_library(libname, secure, UCLIBC_RUNTIME_PREFIX "lib:" UCLIBC_RUNTIME_PREFIX "usr/lib" +#if !defined (__LDSO_CACHE_SUPPORT__) + ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib" +#endif , rpnt) ) != NULL) { diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index 3d1c2ebe4..2da54e0a7 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -21,7 +21,7 @@ TOPDIR=../../ include $(TOPDIR)Rules.mak -XXFLAGS=$(XWARNINGS) $(LIBRARY_CACHE) +XXFLAGS=$(XWARNINGS) ifeq ($(DODEBUG),y) XXFLAGS+=-O0 -g3 else diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 3992163ae..aa19e81cc 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -54,7 +54,7 @@ extern struct elf_resolve *_dl_loaded_modules __attribute__ ((__weak__)); extern struct r_debug *_dl_debug_addr __attribute__ ((__weak__)); extern unsigned long _dl_error_number __attribute__ ((__weak__)); extern void *(*_dl_malloc_function)(size_t) __attribute__ ((__weak__)); -#ifdef USE_CACHE +#ifdef __LDSO_CACHE_SUPPORT__ int _dl_map_cache(void) __attribute__ ((__weak__)); int _dl_unmap_cache(void) __attribute__ ((__weak__)); #endif |