diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-09-21 16:28:08 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-09-21 16:28:08 +0200 |
| commit | cbb47fa1c6476af73f393a81cd62fc926e1b8f6e (patch) | |
| tree | f69ec7916eb45064634f06f09521bea14fe77712 /sysdeps | |
| parent | be728303a6bcf7d2cf8d6c6ccc56d98d65309b81 (diff) | |
malloc: Manual part of conversion to __libc_lock
This removes the old mutex_t-related definitions from malloc-machine.h,
too.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/hurd/malloc-machine.h | 21 | ||||
| -rw-r--r-- | sysdeps/nptl/malloc-machine.h | 8 |
2 files changed, 0 insertions, 29 deletions
diff --git a/sysdeps/mach/hurd/malloc-machine.h b/sysdeps/mach/hurd/malloc-machine.h index f778b0d025..87a5d19bcb 100644 --- a/sysdeps/mach/hurd/malloc-machine.h +++ b/sysdeps/mach/hurd/malloc-machine.h @@ -23,27 +23,6 @@ #include <atomic.h> #include <libc-lock.h> -/* 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)) - -/* No we're *not* using pthreads. */ -#define __pthread_initialize ((void (*)(void))0) - /* madvise is a stub on Hurd, so don't bother calling it. */ #include <sys/mman.h> diff --git a/sysdeps/nptl/malloc-machine.h b/sysdeps/nptl/malloc-machine.h index 1a2af6f987..b20c423f60 100644 --- a/sysdeps/nptl/malloc-machine.h +++ b/sysdeps/nptl/malloc-machine.h @@ -22,14 +22,6 @@ #include <atomic.h> #include <libc-lock.h> - -__libc_lock_define (typedef, mutex_t) - -#define mutex_init(m) __libc_lock_init (*(m)) -#define mutex_lock(m) __libc_lock_lock (*(m)) -#define mutex_trylock(m) __libc_lock_trylock (*(m)) -#define mutex_unlock(m) __libc_lock_unlock (*(m)) - #include <sysdeps/generic/malloc-machine.h> #endif /* !defined(_MALLOC_MACHINE_H) */ |