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. --- sysdeps/generic/malloc-machine.h | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 sysdeps/generic/malloc-machine.h (limited to 'sysdeps/generic/malloc-machine.h') diff --git a/sysdeps/generic/malloc-machine.h b/sysdeps/generic/malloc-machine.h new file mode 100644 index 0000000000..345137060d --- /dev/null +++ b/sysdeps/generic/malloc-machine.h @@ -0,0 +1,68 @@ +/* Basic platform-independent macro definitions for mutexes, + thread-specific data and parameters for malloc. + Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _GENERIC_MALLOC_MACHINE_H +#define _GENERIC_MALLOC_MACHINE_H + +#include + +#ifndef mutex_init /* No threads, provide dummy macros */ + +# define NO_THREADS + +/* The mutex functions used to do absolutely nothing, i.e. lock, + trylock and unlock would always just return 0. However, even + without any concurrently active threads, a mutex can be used + legitimately as an `in use' flag. To make the code that is + protected by a mutex async-signal safe, these macros would have to + be based on atomic test-and-set operations, for example. */ +typedef int mutex_t; + +# define mutex_init(m) (*(m) = 0) +# define mutex_lock(m) ((*(m) = 1), 0) +# define mutex_trylock(m) (*(m) ? 1 : ((*(m) = 1), 0)) +# define mutex_unlock(m) (*(m) = 0) + +typedef void *tsd_key_t; +# define tsd_key_create(key, destr) do {} while(0) +# define tsd_setspecific(key, data) ((key) = (data)) +# define tsd_getspecific(key, vptr) (vptr = (key)) + +# define thread_atfork(prepare, parent, child) do {} while(0) + +#endif /* !defined mutex_init */ + +#ifndef atomic_full_barrier +# define atomic_full_barrier() __asm ("" ::: "memory") +#endif + +#ifndef atomic_read_barrier +# define atomic_read_barrier() atomic_full_barrier () +#endif + +#ifndef atomic_write_barrier +# define atomic_write_barrier() atomic_full_barrier () +#endif + +#ifndef DEFAULT_TOP_PAD +# define DEFAULT_TOP_PAD 131072 +#endif + +#endif /* !defined(_GENERIC_MALLOC_MACHINE_H) */ -- cgit 1.4.1