diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-07-30 06:32:48 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-07-30 06:32:48 +0000 |
| commit | 66f8fa9bec0c6f0e62ccaad22f8ddd36267a5284 (patch) | |
| tree | 46f44a7aa841d5385c7104b4261610ddc28086e5 /malloc/malloc.c | |
| parent | 53308042259bb73ce10aada138dc6bd26dd9a9c2 (diff) | |
| download | glibc-66f8fa9bec0c6f0e62ccaad22f8ddd36267a5284.tar glibc-66f8fa9bec0c6f0e62ccaad22f8ddd36267a5284.tar.gz glibc-66f8fa9bec0c6f0e62ccaad22f8ddd36267a5284.tar.bz2 glibc-66f8fa9bec0c6f0e62ccaad22f8ddd36267a5284.zip | |
Update.
* malloc/malloc.c (ptmalloc_init): Also initialize __libc_pagesize
if no threads are used.
* libio/iofwrite.c: Add weak alias for _unlocked function if not
_IO_MTSAFE_IO.
* libio/iofread.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofputs.c: Likewise.
* sysdeps/generic/bits/libc-lock.h (__libc_cleanup_end): New
definition.
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index a2b80a9997..db12226828 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1663,7 +1663,6 @@ ptmalloc_init __MALLOC_P((void)) /* Initialize the pthreads interface. */ if (__pthread_initialize != NULL) __pthread_initialize(); - __libc_pagesize = __getpagesize(); #endif mutex_init(&main_arena.mutex); mutex_init(&list_lock); @@ -1671,6 +1670,9 @@ ptmalloc_init __MALLOC_P((void)) tsd_setspecific(arena_key, (Void_t *)&main_arena); thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all); #endif /* !defined NO_THREADS */ +#ifdef _LIBC + __libc_pagesize = __getpagesize(); +#endif #if defined _LIBC || defined MALLOC_HOOKS if((s = getenv("MALLOC_TRIM_THRESHOLD_"))) mALLOPt(M_TRIM_THRESHOLD, atoi(s)); |