[git commit ldso-future] ldso: hide _dl_load_elf_shared_library and mark _dl_protect_relro as internal function
Peter S. Mazinger
ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=b25a7d27ce4a800600f79844034c6bd7d475c986
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future
While there, remove duplicate prototype from libdl.c.
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
ldso/include/dl-elf.h | 4 ++--
ldso/ldso/dl-elf.c | 2 +-
ldso/libdl/libdl.c | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
index de8fade..4047399 100644
--- a/ldso/include/dl-elf.h
+++ b/ldso/include/dl-elf.h
@@ -36,9 +36,9 @@ 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);
+ 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);
+extern void _dl_protect_relro (struct elf_resolve *l) internal_function;
/*
* Bitsize related settings for things ElfW()
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 0ee1b62..af4f621 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -114,7 +114,7 @@ int _dl_unmap_cache(void)
#endif
-void
+void internal_function
_dl_protect_relro (struct elf_resolve *l)
{
ElfW(Addr) base = (ElfW(Addr)) DL_RELOC_ADDR(l->loadaddr, l->relro_addr);
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index eae4646..a50fc25 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -56,7 +56,6 @@ extern struct link_map *_dl_update_slotinfo(unsigned long int req_modid);
extern struct elf_resolve * _dl_load_shared_library(int, struct dyn_elf **,
struct elf_resolve *, char *, int);
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 elf_resolve *_dl_loaded_modules;
--
1.7.3.4
More information about the uClibc-cvs
mailing list