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/mach/hurd/malloc-machine.h | 58 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 sysdeps/mach/hurd/malloc-machine.h (limited to 'sysdeps/mach/hurd') diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h new file mode 100644 index 0000000000..f04947fe98 --- /dev/null +++ b/sysdeps/mach/hurd/malloc-machine.h @@ -0,0 +1,58 @@ +/* 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 _MALLOC_MACHINE_H +#define _MALLOC_MACHINE_H + +#undef thread_atfork_static + +#include +#include + +/* Assume hurd, with cthreads */ + +/* Cthreads `mutex_t' is a pointer to a mutex, and malloc wants just the + mutex itself. */ +#undef mutex_t +#define mutex_t struct mutex + +#undef mutex_init +#define mutex_init(m) (__mutex_init(m), 0) + +#undef mutex_lock +#define mutex_lock(m) (__mutex_lock(m), 0) + +#undef mutex_unlock +#define mutex_unlock(m) (__mutex_unlock(m), 0) + +#define mutex_trylock(m) (!__mutex_trylock(m)) + +#define thread_atfork(prepare, parent, child) do {} while(0) +#define thread_atfork_static(prepare, parent, child) \ + text_set_element(_hurd_fork_prepare_hook, prepare); \ + text_set_element(_hurd_fork_parent_hook, parent); \ + text_set_element(_hurd_fork_child_hook, child); + +/* No we're *not* using pthreads. */ +#define __pthread_initialize ((void (*)(void))0) + +#include + +#endif /* !defined(_MALLOC_MACHINE_H) */ -- cgit 1.4.1