diff options
| author | Roland McGrath <roland@gnu.org> | 2002-12-06 11:15:07 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-12-06 11:15:07 +0000 |
| commit | fde89ad0091e492bd2d99d9d4925fbd62a7dc643 (patch) | |
| tree | a3463d94ac501cf65556a614a54a66b64cfaf1ad /malloc/malloc.c | |
| parent | d58847f9529bd81ff603e3a2beff7c6306165dac (diff) | |
| download | glibc-fde89ad0091e492bd2d99d9d4925fbd62a7dc643.tar glibc-fde89ad0091e492bd2d99d9d4925fbd62a7dc643.tar.gz glibc-fde89ad0091e492bd2d99d9d4925fbd62a7dc643.tar.bz2 glibc-fde89ad0091e492bd2d99d9d4925fbd62a7dc643.zip | |
* sysdeps/generic/libc-tls.c (__libc_setup_tls): Cope with zero ALIGN.
* malloc/hooks.c [_LIBC && (USE___THREAD || (USE_TLS && !SHARED))]
(malloc_starter, memalign_starter, free_starter): Don't define these.
* malloc/malloc.c [_LIBC && (USE___THREAD || (USE_TLS && !SHARED))]:
Don't declare them either.
* malloc/arena.c (ptmalloc_init) [_LIBC && USE_TLS]: Don't call
__pthread_initialize, so no need to set hooks to *_starter.
(ptmalloc_init_minimal): New function, broken out of ptmalloc_init.
[_LIBC && SHARED && USE_TLS && !USE___THREAD]
(__libc_malloc_pthread_startup): New function.
* malloc/Versions (libc: GLIBC_PRIVATE): New set, add that function.
* malloc/hooks.c (memalign_starter): New function.
* malloc/malloc.c: Declare it.
* malloc/arena.c (save_memalign_hook): New variable.
(ptmalloc_init): Set __memalign_hook to memalign_starter.
* elf/dl-minimal.c (free): Clear the memory.
(calloc): Just call malloc, knowing all memory it returns is cleared.
* sysdeps/generic/dl-tls.c (allocate_dtv): Use calloc instead of
malloc and memset; calloc can avoid the zeroing when redundant.
(_dl_tls_setup): Likewise.
* elf/dl-load.c (decompose_rpath): Likewise.
* sysdeps/generic/libc-tls.c (__libc_setup_tls): Comment out memset
call, since memory from sbrk at startup is already zero.
* elf/rtld.c (_dl_start, dl_main): TLS_INIT_TP macro now returns an
error string for failure, null for success. Update callers.
* sysdeps/generic/libc-tls.c (__libc_setup_tls): Likewise.
* elf/dl-load.c (_dl_map_object_from_fd): Likewise.
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 757e65a37f..36a244dad7 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1498,8 +1498,19 @@ static Void_t* realloc_check(Void_t* oldmem, size_t bytes, static Void_t* memalign_check(size_t alignment, size_t bytes, const Void_t *caller); #ifndef NO_THREADS +# ifdef _LIBC +# if USE___THREAD || (defined USE_TLS && !defined SHARED) + /* These routines are never needed in this configuration. */ +# define NO_STARTER +# endif +# endif +# ifdef NO_STARTER +# undef NO_STARTER +# else static Void_t* malloc_starter(size_t sz, const Void_t *caller); +static Void_t* memalign_starter(size_t aln, size_t sz, const Void_t *caller); static void free_starter(Void_t* mem, const Void_t *caller); +# endif static Void_t* malloc_atfork(size_t sz, const Void_t *caller); static void free_atfork(Void_t* mem, const Void_t *caller); #endif |