[git commit ldso-future] ldso/libdl: move _dl_handles to libdl.c and make it static

Peter S. Mazinger ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=92ac799019bcc1ca045d40a8486eb3fac92b0d5c
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 |    1 -
 ldso/ldso/dl-hash.c    |    6 ------
 ldso/libdl/libdl.c     |    7 ++++++-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h
index 0a7d9fd..b3f811b 100644
--- a/ldso/include/dl-hash.h
+++ b/ldso/include/dl-hash.h
@@ -150,7 +150,6 @@ struct elf_resolve {
 
 extern struct dyn_elf     * _dl_symbol_tables;
 extern struct elf_resolve * _dl_loaded_modules;
-extern struct dyn_elf     * _dl_handles;
 
 extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname,
 	DL_LOADADDR_TYPE loadaddr, ElfW(Word) * dynamic_info,
diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c
index 4ece1ad..fa6b316 100644
--- a/ldso/ldso/dl-hash.c
+++ b/ldso/ldso/dl-hash.c
@@ -40,12 +40,6 @@
  */
 struct dyn_elf *_dl_symbol_tables = NULL;
 
-/*
- * This is the list of modules that are loaded via dlopen.  We may need
- * to search these for RTLD_GLOBAL files.
- */
-struct dyn_elf *_dl_handles = NULL;
-
 #ifdef __LDSO_GNU_HASH_SUPPORT__
 /* This is the new hash function that is used by the ELF linker to generate the
  * GNU hash table that each executable and library will have if --hash-style=[gnu,both]
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 2c6d770..e3a1a86 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -59,7 +59,6 @@ extern int _dl_fixup(struct dyn_elf *rpnt, int lazy);
 extern void _dl_protect_relro(struct elf_resolve * tpnt);
 extern int _dl_errno;
 extern struct dyn_elf *_dl_symbol_tables;
-extern struct dyn_elf *_dl_handles;
 extern struct elf_resolve *_dl_loaded_modules;
 extern void _dl_free (void *__ptr);
 extern struct r_debug *_dl_debug_addr;
@@ -116,6 +115,12 @@ size_t _dl_tls_static_size = 2048;
 #include "../ldso/dl-elf.c"
 #endif /* SHARED */
 
+/*
+ * This is the list of modules that are loaded via dlopen.  We may need
+ * to search these for RTLD_GLOBAL files.
+ */
+static struct dyn_elf *_dl_handles = NULL;
+
 #ifdef __SUPPORT_LD_DEBUG__
 # define _dl_if_debug_print(fmt, args...) \
 	do { \
-- 
1.7.3.4



More information about the uClibc-cvs mailing list