aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-31 04:34:31 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-31 04:34:31 +0000
commit94ffedf6e607675b0eeb7dfec020d722a0b94230 (patch)
tree1446cd6190c378a9739ff5b5edf42cdfb0e08866
parent66f8fa9bec0c6f0e62ccaad22f8ddd36267a5284 (diff)
downloadglibc-94ffedf6e607675b0eeb7dfec020d722a0b94230.tar
glibc-94ffedf6e607675b0eeb7dfec020d722a0b94230.tar.gz
glibc-94ffedf6e607675b0eeb7dfec020d722a0b94230.tar.bz2
glibc-94ffedf6e607675b0eeb7dfec020d722a0b94230.zip
Update.
1999-07-30 Ulrich Drepper <drepper@cygnus.com> * malloc/malloc.c (ptmalloc_init): Correct last patch. The assignment cannot be moved.
-rw-r--r--ChangeLog5
-rw-r--r--malloc/malloc.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4437c3b67b..6060305497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-30 Ulrich Drepper <drepper@cygnus.com>
+
+ * malloc/malloc.c (ptmalloc_init): Correct last patch. The
+ assignment cannot be moved.
+
1999-07-29 H.J. Lu <hjl@gnu.org>
* malloc/malloc.c (ptmalloc_init): Also initialize __libc_pagesize
diff --git a/malloc/malloc.c b/malloc/malloc.c
index db12226828..143009bdfc 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1663,16 +1663,18 @@ 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);
tsd_key_create(&arena_key, NULL);
tsd_setspecific(arena_key, (Void_t *)&main_arena);
thread_atfork(ptmalloc_lock_all, ptmalloc_unlock_all, ptmalloc_init_all);
-#endif /* !defined NO_THREADS */
+#else /* !defined NO_THREADS */
#ifdef _LIBC
__libc_pagesize = __getpagesize();
#endif
+#endif /* !defined NO_THREADS */
#if defined _LIBC || defined MALLOC_HOOKS
if((s = getenv("MALLOC_TRIM_THRESHOLD_")))
mALLOPt(M_TRIM_THRESHOLD, atoi(s));