From 3c6904fb49841a94395bcfe863eb6c8bf10a29d2 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 30 Sep 2003 02:10:33 +0000 Subject: Update. 2003-09-27 Wolfram Gloger * malloc/malloc.c: Include earlier instead of "thread-m.h", so that default parameters can be overridden in a system-specific malloc-machine.h. Remove extra ; from extern "C" closing brace. * sysdeps/generic/malloc-machine.h: New file. * sysdeps/mach/hurd/malloc-machine.h: New file. * malloc/thread-m.h: Removed. * malloc/Makefile: Remove CFLAGS-malloc.c parameter addition, it is in sysdeps/generic/malloc-machine.h now. * elf/dl-reloc.c (_dl_allocate_static_tls): Move definition of variables only used if TLS_TCB_AT_TP is defined into the #if branch. --- elf/dl-reloc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'elf') diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 911ce39..2c878fc 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -51,9 +51,6 @@ _dl_allocate_static_tls (struct link_map *map) size_t offset; size_t used; size_t check; - size_t freebytes; - size_t n; - size_t blsize; /* If the alignment requirements are too high fail. */ if (map->l_tls_align > GL(dl_tls_static_align)) @@ -64,6 +61,10 @@ cannot allocate memory in static TLS block")); } # if TLS_TCB_AT_TP + size_t freebytes; + size_t n; + size_t blsize; + freebytes = GL(dl_tls_static_size) - GL(dl_tls_static_used) - TLS_TCB_SIZE; blsize = map->l_tls_blocksize + map->l_tls_firstbyte_offset; -- cgit v1.1