diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-10-15 16:15:59 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-10-15 17:09:23 -0400 |
| commit | 1f5e333a158f4398437287b8b64260371422194f (patch) | |
| tree | 93d3ccf85cd0e03d9d534a615af1646123e433ec /ldso/include | |
| parent | 21cec43543081b47f9f7d5860af44d04c92746cd (diff) | |
ldso: clean up breakage in tls merge
The TLS merge 534661b91c9849 introduced multiple style problems as well as
random breakage:
- missing _dl_free
- incomplete parametrization of _dl_lookup_hash
- restore FDPIC handling in _dl_lookup_hash
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'ldso/include')
| -rw-r--r-- | ldso/include/dl-hash.h | 13 | ||||
| -rw-r--r-- | ldso/include/ldso.h | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index d8a927378..496ec0fa5 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -131,7 +131,7 @@ 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 dyn_elf * _dl_handles; extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname, DL_LOADADDR_TYPE loadaddr, unsigned long * dynamic_info, @@ -139,23 +139,24 @@ extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname, #if USE_TLS || defined __FDPIC__ #define _DL_LOOKUP_HASH_NEEDS_EXTRA_TPNT -#define _DL_LOOKUP_HASH_EXTRA_TPNT ,struct elf_resolve **tpntp +#define _DL_LOOKUP_HASH_EXTRA_TPNT , struct elf_resolve **tpntp #else #undef _DL_LOOKUP_HASH_NEEDS_EXTRA_TPNT #define _DL_LOOKUP_HASH_EXTRA_TPNT #endif extern char * _dl_lookup_hash(const char * name, struct dyn_elf * rpnt, - struct elf_resolve *mytpnt, int type_class _DL_LOOKUP_HASH_EXTRA_TPNT); + struct elf_resolve *mytpnt, int type_class + _DL_LOOKUP_HASH_EXTRA_TPNT); static __always_inline char *_dl_find_hash(const char *name, struct dyn_elf *rpnt, struct elf_resolve *mytpnt, int type_class, struct elf_resolve **tpntp) { #ifdef _DL_LOOKUP_HASH_NEEDS_EXTRA_TPNT - return _dl_lookup_hash(name, rpnt, mytpnt, type_class, tpntp); + return _dl_lookup_hash(name, rpnt, mytpnt, type_class, tpntp); #else - return _dl_lookup_hash(name, rpnt, mytpnt, type_class); + return _dl_lookup_hash(name, rpnt, mytpnt, type_class); #endif } @@ -183,6 +184,4 @@ static __inline__ int _dl_symbol(char * name) #define LD_BAD_HANDLE 10 #define LD_NO_SYMBOL 11 - - #endif /* _LD_HASH_H_ */ diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 3612fa80f..99dcf839c 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -119,8 +119,8 @@ extern int _dl_debug_file; #endif extern void *_dl_malloc(size_t size); -extern void * _dl_calloc(size_t __nmemb, size_t __size); -extern void * _dl_realloc(void * __ptr, size_t __size); +extern void *_dl_calloc(size_t __nmemb, size_t __size); +extern void *_dl_realloc(void *__ptr, size_t __size); extern void _dl_free(void *); extern char *_dl_getenv(const char *symbol, char **envp); extern void _dl_unsetenv(const char *symbol, char **envp); |