diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2005-08-01 10:58:23 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2005-08-01 10:58:23 +0000 |
| commit | 47c86642855d3690d831c1329ae6d4042b61b509 (patch) | |
| tree | 0e40345ab1e7813790b731f07bf8d3953f6841cf /ldso | |
| parent | 0ad448b780c6b1f5f0efc3278f51a6d5586b3df9 (diff) | |
Add dependency on ld-uClibc.so.0 for libdl.so.
Remove __attribute__ ((__weak__)) from imported ld-uClibc.so.0 symbols.
Diffstat (limited to 'ldso')
| -rw-r--r-- | ldso/libdl/Makefile | 2 | ||||
| -rw-r--r-- | ldso/libdl/libdl.c | 34 |
2 files changed, 16 insertions, 20 deletions
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index c26954e47..d4d54f911 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -74,7 +74,7 @@ shared: $(LIBDL_PIC) $(LD) $(LDFLAGS) -soname=$(LIBDL_SHARED).$(MAJOR_VERSION) \ -o $(LIBDL_SHARED_FULLNAME) -fini dl_cleanup --whole-archive $(LIBDL_PIC) \ --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \ - -L$(TOPDIR)/lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); + -L$(TOPDIR)/lib -lc $(LDADD_LIBFLOAT) $(TOPDIR)lib/ld-uClibc.so.0 $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 76c8296e1..add476b81 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -40,31 +40,27 @@ /* When libdl is loaded as a shared library, we need to load in * and use a pile of symbols from ldso... */ -extern char *_dl_find_hash(const char *, struct dyn_elf *, struct elf_resolve *, int) - __attribute__ ((__weak__)); +extern char *_dl_find_hash(const char *, struct dyn_elf *, struct elf_resolve *, int); extern struct elf_resolve * _dl_load_shared_library(int, struct dyn_elf **, - struct elf_resolve *, char *, int) __attribute__ ((__weak__)); -extern int _dl_fixup(struct dyn_elf *rpnt, int lazy) - __attribute__ ((__weak__)); -extern void _dl_protect_relro(struct elf_resolve * tpnt) - __attribute__ ((__weak__)); -extern int _dl_errno __attribute__ ((__weak__)); -extern struct dyn_elf *_dl_symbol_tables __attribute__ ((__weak__)); -extern struct dyn_elf *_dl_handles __attribute__ ((__weak__)); -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__)); + 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 dyn_elf *_dl_handles; +extern struct elf_resolve *_dl_loaded_modules; +extern struct r_debug *_dl_debug_addr; +extern unsigned long _dl_error_number; +extern void *(*_dl_malloc_function)(size_t); #ifdef __LDSO_CACHE_SUPPORT__ -int _dl_map_cache(void) __attribute__ ((__weak__)); -int _dl_unmap_cache(void) __attribute__ ((__weak__)); +int _dl_map_cache(void); +int _dl_unmap_cache(void); #endif #ifdef __mips__ -extern void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy) - __attribute__ ((__weak__)); +extern void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy); #endif #ifdef __SUPPORT_LD_DEBUG__ -extern char *_dl_debug __attribute__ ((__weak__)); +extern char *_dl_debug; #endif |