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/ldso/dl-tls.c | |
| 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/ldso/dl-tls.c')
| -rw-r--r-- | ldso/ldso/dl-tls.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/ldso/ldso/dl-tls.c b/ldso/ldso/dl-tls.c index e718373cd..52b7aa534 100644 --- a/ldso/ldso/dl-tls.c +++ b/ldso/ldso/dl-tls.c @@ -46,7 +46,7 @@ void * _dl_calloc (size_t __nmemb, size_t __size) { void *result; - size_t size = (__size * __nmemb); + size_t size = (__size * __nmemb); if (_dl_calloc_function) return (*_dl_calloc_function) (__nmemb, __size); @@ -68,18 +68,6 @@ _dl_realloc (void * __ptr, size_t __size) return NULL; } -void -_dl_free (void *__ptr) -{ - if (_dl_free_function) - (*_dl_free_function) (__ptr); - -#if 0 - _dl_debug_early("NOT IMPLEMENTED PROPERLY!!!\n"); -#endif -} - - /* The __tls_get_addr function has two basic forms which differ in the arguments. The IA-64 form takes two parameters, the module ID and offset. The form used, among others, on IA-32 takes a reference to @@ -1009,7 +997,7 @@ init_tls (void) /* This is a module with TLS data. Store the map reference. The generation counter is zero. */ - /* Skeep slot[0]: it will be never used */ + /* Skeep slot[0]: it will be never used */ slotinfo[++i].map = l; } _dl_assert (i == _dl_tls_max_dtv_idx); |