[git commit ldso-future] ldso: make a bunch of functions static
Peter S. Mazinger
ps.m at gmx.net
Mon Apr 11 11:27:03 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=44627e878e11cda2b766293c322e5a95b5722b4f
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future
They all go into the same file, no need to handle them as hidden
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
ldso/include/dl-elf.h | 6 ------
ldso/include/dl-hash.h | 4 ----
ldso/ldso/dl-elf.c | 5 ++++-
ldso/ldso/dl-hash.c | 2 +-
ldso/ldso/elfinterp_common.c | 10 ++++------
ldso/ldso/ldso.c | 17 ++++++++++-------
ldso/ldso/mips/elfinterp.c | 10 ++++------
ldso/ldso/powerpc/elfinterp.c | 5 ++---
8 files changed, 25 insertions(+), 34 deletions(-)
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
index addf23a..0103d3d 100644
--- a/ldso/include/dl-elf.h
+++ b/ldso/include/dl-elf.h
@@ -28,15 +28,9 @@ static __inline__ void _dl_unmap_cache(void) { }
#endif
/* Function prototypes for non-static stuff in dl-elf.c and elfinterp.c */
-extern void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- ElfW(Addr) rel_addr, ElfW(Word) rel_size);
-extern int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- ElfW(Addr) rel_addr, ElfW(Word) rel_size);
extern struct elf_resolve * _dl_load_shared_library(int secure,
struct dyn_elf **rpnt, struct elf_resolve *tpnt, char *full_libname,
int trace_loaded_objects);
-extern struct elf_resolve * _dl_load_elf_shared_library(int secure,
- struct dyn_elf **rpnt, char *libname) attribute_hidden;
extern int _dl_fixup(struct dyn_elf *rpnt, int flag);
extern void _dl_protect_relro (struct elf_resolve *l) internal_function;
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h
index b3f811b..3e25692 100644
--- a/ldso/include/dl-hash.h
+++ b/ldso/include/dl-hash.h
@@ -151,10 +151,6 @@ struct elf_resolve {
extern struct dyn_elf * _dl_symbol_tables;
extern struct elf_resolve * _dl_loaded_modules;
-extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname,
- DL_LOADADDR_TYPE loadaddr, ElfW(Word) * dynamic_info,
- ElfW(Addr) dynamic_addr, unsigned long dynamic_size);
-
extern char *_dl_find_hash(const char *name, struct dyn_elf *rpnt,
struct elf_resolve *mytpnt, int type_class,
struct symbol_ref *symbol);
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 0d3640d..8832c1a 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -31,6 +31,9 @@
#include <ldso.h>
+static struct elf_resolve * _dl_load_elf_shared_library(int secure,
+ struct dyn_elf **rpnt, char *libname);
+
#ifdef __LDSO_CACHE_SUPPORT__
static caddr_t _dl_cache_addr = NULL;
@@ -320,7 +323,7 @@ goof:
* are required.
*/
-struct elf_resolve *_dl_load_elf_shared_library(int secure,
+static struct elf_resolve *_dl_load_elf_shared_library(int secure,
struct dyn_elf **rpnt, char *libname)
{
ElfW(Ehdr) *epnt;
diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c
index fa6b316..1232c0d 100644
--- a/ldso/ldso/dl-hash.c
+++ b/ldso/ldso/dl-hash.c
@@ -82,7 +82,7 @@ static __inline__ Elf_Symndx _dl_elf_hash(const unsigned char *name)
* We add the relevant info to the symbol chain, so that we can resolve all
* externals properly.
*/
-struct elf_resolve *_dl_add_elf_hash_table(const char *libname,
+static struct elf_resolve *_dl_add_elf_hash_table(const char *libname,
DL_LOADADDR_TYPE loadaddr, ElfW(Word) *dynamic_info, ElfW(Addr) dynamic_addr,
attribute_unused unsigned long dynamic_size)
{
diff --git a/ldso/ldso/elfinterp_common.c b/ldso/ldso/elfinterp_common.c
index c89ffda..a9f4092 100644
--- a/ldso/ldso/elfinterp_common.c
+++ b/ldso/ldso/elfinterp_common.c
@@ -186,9 +186,8 @@ static int _dl_parse(struct elf_resolve *tpnt, struct dyn_elf *scope,
return 0;
}
-int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- ElfW(Addr) rel_addr,
- ElfW(Word) rel_size)
+static int _dl_parse_relocation_information(struct dyn_elf *rpnt,
+ ElfW(Addr) rel_addr, ElfW(Word) rel_size)
{
return _dl_parse(rpnt->dyn, rpnt->dyn->symbol_scope, rel_addr, rel_size, _dl_do_reloc);
}
@@ -245,9 +244,8 @@ static __always_inline int _dl_do_lazy_reloc(struct elf_resolve *tpnt, struct dy
#endif
#ifndef ARCH_HAS_LAZY
-void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- ElfW(Addr) rel_addr,
- ElfW(Word) rel_size)
+static void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
+ ElfW(Addr) rel_addr, ElfW(Word) rel_size)
{
# if defined ELF_MACHINE_NONE && defined ELF_MACHINE_JMP_SLOT
(void)_dl_parse(rpnt->dyn, NULL, rel_addr, rel_size, _dl_do_lazy_reloc);
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index f2ea13b..b7c2a8a 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -64,9 +64,9 @@ void (*_dl_free_function) (void *p) = NULL;
static int _dl_secure = 1; /* Are we dealing with setuid stuff? */
-void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
- DL_GET_READY_TO_RUN_EXTRA_PARMS) attribute_hidden;
+static __always_inline void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+ ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
+ DL_GET_READY_TO_RUN_EXTRA_PARMS);
#include "dl-startup.c"
#include "dl-symbols.c"
@@ -267,10 +267,13 @@ static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void)
}
}
-void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp,
- char **argv
- DL_GET_READY_TO_RUN_EXTRA_PARMS)
+static struct elf_resolve * _dl_add_elf_hash_table(const char * libname,
+ DL_LOADADDR_TYPE loadaddr, ElfW(Word) * dynamic_info,
+ ElfW(Addr) dynamic_addr, unsigned long dynamic_size);
+
+static __always_inline void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+ ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp,
+ char **argv DL_GET_READY_TO_RUN_EXTRA_PARMS)
{
ElfW(Addr) app_mapaddr = 0;
ElfW(Phdr) *ppnt;
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c
index 10e752d..fd41c44 100644
--- a/ldso/ldso/mips/elfinterp.c
+++ b/ldso/ldso/mips/elfinterp.c
@@ -81,17 +81,15 @@ unsigned long __dl_runtime_resolve(unsigned long sym_index,
return new_addr;
}
-void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- ElfW(Addr) rel_addr,
- ElfW(Word) rel_size)
+static void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
+ ElfW(Addr) rel_addr, ElfW(Word) rel_size)
{
/* Nothing to do */
return;
}
-int _dl_parse_relocation_information(struct dyn_elf *xpnt,
- ElfW(Addr) rel_addr,
- ElfW(Word) rel_size)
+static int _dl_parse_relocation_information(struct dyn_elf *xpnt,
+ ElfW(Addr) rel_addr, ElfW(Word) rel_size)
{
ElfW(Addr) *reloc_addr = NULL;
struct elf_resolve *tpnt = xpnt->dyn;
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index 21b5869..b96ce36 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -358,9 +358,8 @@ _dl_do_reloc(struct elf_resolve *tpnt,struct dyn_elf *scope,
return 0;
}
-void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- ElfW(Addr) rel_addr,
- ElfW(Word) rel_size)
+static void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
+ ElfW(Addr) rel_addr, ElfW(Word) rel_size)
{
struct elf_resolve *tpnt = rpnt->dyn;
ElfW(Word) *plt, offset, i, num_plt_entries, rel_offset_words;
--
1.7.3.4
More information about the uClibc-cvs
mailing list