[git commit ldso-future 1/1] ldso, libdl: hide _dl_library_path, it is used only in ldso and libdl.a
Peter S. Mazinger
ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=89b0e185f41e1086a4e32a63f13a09266fec4069
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
ldso/include/dl-hash.h | 2 --
ldso/include/ldso.h | 10 +++++-----
ldso/libdl/libdl.c | 2 ++
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h
index 1317534..699e691 100644
--- a/ldso/include/dl-hash.h
+++ b/ldso/include/dl-hash.h
@@ -146,8 +146,6 @@ extern char *_dl_find_hash(const char *name, struct dyn_elf *rpnt,
struct elf_resolve *mytpnt, int type_class,
struct symbol_ref *symbol);
-extern char * _dl_library_path;
-
#define LD_ERROR_NOFILE 1
#define LD_ERROR_NOZERO 2
#define LD_ERROR_NOTELF 3
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index 1d55ef0..1127a61 100644
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -67,11 +67,11 @@ struct init_fini_list {
};
/* Global variables used within the shared library loader */
-extern char *_dl_library_path; /* Where we look for libraries */
-extern char *_dl_preload; /* Things to be loaded before the libs */
-extern char *_dl_ldsopath; /* Where the shared lib loader was found */
-extern const char *_dl_progname; /* The name of the executable being run */
-extern size_t _dl_pagesize; /* Store the page size for use later */
+extern char *_dl_library_path attribute_hidden; /* Where we look for libraries */
+extern char *_dl_preload; /* Things to be loaded before the libs */
+extern char *_dl_ldsopath; /* Where the shared lib loader was found */
+extern const char *_dl_progname; /* The name of the executable being run */
+extern size_t _dl_pagesize; /* Store the page size for use later */
#if defined(USE_TLS) && USE_TLS
extern void _dl_add_to_slotinfo (struct link_map *l);
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 3341f03..f4dc289 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -100,7 +100,9 @@ int _dl_debug_file = 2;
const char *_dl_progname = ""; /* Program name */
void *(*_dl_malloc_function)(size_t);
void (*_dl_free_function) (void *p);
+#ifndef SHARED
char *_dl_library_path = NULL; /* Where we look for libraries */
+#endif
char *_dl_ldsopath = NULL; /* Location of the shared lib loader */
int _dl_errno = 0; /* We can't use the real errno in ldso */
size_t _dl_pagesize = PAGE_SIZE; /* Store the page size for use later */
--
1.7.3.4
More information about the uClibc-cvs
mailing list