From 886d5973b793fbb53705db7754ebfb93c1224d26 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 30 Jan 2003 18:41:47 +0000 Subject: [PATCH] Update. 2002-10-07 Wolfram Gloger * malloc/malloc.c (sYSMALLOc): Only check for breakage due to foreign sbrk()'s if arena is contiguous. Bug report from Bruno Haible . 2003-01-30 Jakub Jelinek * sysdeps/s390/libc-tls.c: Include stdlib.h. 2003-01-30 Jakub Jelinek * stdio-common/vfprintf.c (vfprintf): Only subtract lowest 3 bits of ps.__count. 2003-01-30 Ulrich Drepper * sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Fix storing and restoring of %r6. * sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise. Use 64-bit load. Patch by Martin Schwidefsky . 2003-01-30 Jakub Jelinek * elf/dl-reloc.c (CHECK_STATIC_TLS): Move _dl_signal_error... (allocate_static_tls): ...here. Add __attribute_noinline__. Don't return on failure. (_dl_reloc_bad_type): Add __attribute_noinline__. * elf/do-rel.h (elf_dynamic_do_rel): Add __attribute__((always_inline)). * elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, elf_machine_rel_relative, elf_machine_rela_relative, elf_machine_lazy_rel): Add prototypes with __attribute__((always_inline)). 2003-01-29 David Mosberger * elf/dl-support.c (_dl_aux_init): Handle AT_SYSINFO. --- ChangeLog | 41 +++++++++++++++++++++++++++++++- linuxthreads/ChangeLog | 4 ++++ linuxthreads/sysdeps/s390/tls.h | 2 +- malloc/malloc.c | 2 +- nptl/ChangeLog | 5 ++++ nptl/sysdeps/pthread/pthread-functions.h | 2 +- stdio-common/vfprintf.c | 2 +- sysdeps/s390/libc-tls.c | 4 ++-- 8 files changed, 55 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f19aff..51b9b13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,46 @@ +2002-10-07 Wolfram Gloger + + * malloc/malloc.c (sYSMALLOc): Only check for breakage due + to foreign sbrk()'s if arena is contiguous. Bug report from + Bruno Haible . + +2003-01-30 Jakub Jelinek + + * sysdeps/s390/libc-tls.c: Include stdlib.h. + +2003-01-30 Jakub Jelinek + + * stdio-common/vfprintf.c (vfprintf): Only subtract lowest 3 bits of + ps.__count. + +2003-01-30 Ulrich Drepper + + * sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Fix storing and + restoring of %r6. + * sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise. Use + 64-bit load. + Patch by Martin Schwidefsky . + +2003-01-30 Jakub Jelinek + + * elf/dl-reloc.c (CHECK_STATIC_TLS): Move _dl_signal_error... + (allocate_static_tls): ...here. Add __attribute_noinline__. + Don't return on failure. + (_dl_reloc_bad_type): Add __attribute_noinline__. + * elf/do-rel.h (elf_dynamic_do_rel): Add + __attribute__((always_inline)). + * elf/dynamic-link.h (elf_machine_rel, elf_machine_rela, + elf_machine_rel_relative, elf_machine_rela_relative, + elf_machine_lazy_rel): Add prototypes with + __attribute__((always_inline)). + +2003-01-29 David Mosberger + + * elf/dl-support.c (_dl_aux_init): Handle AT_SYSINFO. + 2003-01-29 Roland McGrath * configure.in: Barf if configured in $srcdir. - * configure: Regenerated. 2003-01-28 Steven Munroe diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 52da326..516664c 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,9 @@ 2003-01-30 Jakub Jelinek + * sysdeps/s390/tls.h (TLS_INIT_TP): Return NULL, not 0. + +2003-01-30 Jakub Jelinek + * sysdeps/alpha/tls.h (THREAD_GETMEM, THREAD_GETMEM_NC, THREAD_SETMEM, THREAD_SETMEM_NC): Avoid warnings about unused self variable. diff --git a/linuxthreads/sysdeps/s390/tls.h b/linuxthreads/sysdeps/s390/tls.h index 11f31ba..41a83a7 100644 --- a/linuxthreads/sysdeps/s390/tls.h +++ b/linuxthreads/sysdeps/s390/tls.h @@ -110,7 +110,7 @@ typedef struct head->self = _descr; \ \ __builtin_set_thread_pointer (_descr); \ - 0; \ + NULL; \ }) /* Return the address of the dtv for the current thread. */ diff --git a/malloc/malloc.c b/malloc/malloc.c index da834d2..4d1773a 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2944,7 +2944,7 @@ static Void_t* sYSMALLOc(nb, av) INTERNAL_SIZE_T nb; mstate av; if (brk == old_end && snd_brk == (char*)(MORECORE_FAILURE)) set_head(old_top, (size + old_size) | PREV_INUSE); - else if (old_size && brk < old_end) { + else if (contiguous(av) && old_size && brk < old_end) { /* Oops! Someone else killed our space.. Can't touch anything. */ assert(0); } diff --git a/nptl/ChangeLog b/nptl/ChangeLog index f6977ab..9d9c68c 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2003-01-30 Jakub Jelinek + + * sysdeps/pthread/pthread-functions.h (struct pthread_functions): + Fix return type of ptr___pthread_getspecific. + 2003-01-29 Ulrich Drepper * Makefile (tests): Add tst-umask1. diff --git a/nptl/sysdeps/pthread/pthread-functions.h b/nptl/sysdeps/pthread/pthread-functions.h index 17e3f83..45c7f90 100644 --- a/nptl/sysdeps/pthread/pthread-functions.h +++ b/nptl/sysdeps/pthread/pthread-functions.h @@ -77,7 +77,7 @@ struct pthread_functions int (*ptr___pthread_rwlock_wrlock) (pthread_rwlock_t *); int (*ptr___pthread_rwlock_unlock) (pthread_rwlock_t *); int (*ptr___pthread_key_create) (pthread_key_t *, void (*) (void *)); - int (*ptr___pthread_getspecific) (pthread_key_t); + void *(*ptr___pthread_getspecific) (pthread_key_t); int (*ptr___pthread_setspecific) (pthread_key_t, const void *); void (*ptr__pthread_cleanup_push_defer) (struct _pthread_cleanup_buffer *, void (*) (void *), void *); diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index 26277e2..087bf91 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -1185,7 +1185,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) if (str2 == NULL) \ len = strlen (string); \ else \ - len = str2 - string - (ps.__count); \ + len = str2 - string - (ps.__count & 7); \ } \ } \ else \ diff --git a/sysdeps/s390/libc-tls.c b/sysdeps/s390/libc-tls.c index bc433f8..7362dbf 100644 --- a/sysdeps/s390/libc-tls.c +++ b/sysdeps/s390/libc-tls.c @@ -1,4 +1,4 @@ -/* Thread-local storage handling in the ELF dynamic linker. IA-64 version. +/* Thread-local storage handling in the ELF dynamic linker. S390 version. Copyright (C) 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include #include #if USE_TLS @@ -34,4 +35,3 @@ __tls_get_offset (size_t m, size_t offset) } #endif - -- 2.7.4