fb4cc8a0c2
* hurd/Makefile (routines): Add hurdlock. * hurd/Versions (GLIBC_PRIVATE): Added new entry to export the above interface. (HURD_CTHREADS_0.3): Remove __libc_getspecific. * hurd/hurdpid.c: Include <lowlevellock.h> (_S_msg_proc_newids): Use lll_wait to synchronize. * hurd/hurdsig.c: (reauth_proc): Use __mutex_lock and __mutex_unlock. * hurd/setauth.c: Include <hurdlock.h>, use integer for synchronization. * mach/Makefile (lock-headers): Remove machine-lock.h. * mach/lock-intern.h: Include <lowlevellock.h> instead of <machine-lock.h>. (__spin_lock_t): New type. (__SPIN_LOCK_INITIALIZER): New macro. (__spin_lock, __spin_unlock, __spin_try_lock, __spin_lock_locked, __mutex_init, __mutex_lock_solid, __mutex_unlock_solid, __mutex_lock, __mutex_unlock, __mutex_trylock): Use lll to implement locks. * mach/mutex-init.c: Include <lowlevellock.h> instead of <cthreads.h>. (__mutex_init): Initialize with lll. * manual/errno.texi (EOWNERDEAD, ENOTRECOVERABLE): New errno values. * sysdeps/mach/Makefile: Add libmachuser as dependencies for libs needing lll. * sysdeps/mach/hurd/bits/errno.h: Regenerate. * sysdeps/mach/hurd/cthreads.c (__libc_getspecific): Remove function. * sysdeps/mach/hurd/bits/libc-lock.h: Remove file. * sysdeps/mach/hurd/setpgid.c: Include <lowlevellock.h>. (__setpgid): Use lll for synchronization. * sysdeps/mach/hurd/setsid.c: Likewise with __setsid. * sysdeps/mach/bits/libc-lock.h: Include <tls.h> and <lowlevellock.h> instead of <cthreads.h>. (_IO_lock_inexpensive): New macro (__libc_lock_recursive_t, __rtld_lock_recursive_t): New structures. (__libc_lock_self0): New declaration. (__libc_lock_owner_self): New macro. (__libc_key_t): Remove type. (_LIBC_LOCK_INITIALIZER): New macro. (__libc_lock_define_initialized, __libc_lock_init, __libc_lock_fini, __libc_lock_fini_recursive, __rtld_lock_fini_recursive, __libc_lock_lock, __libc_lock_trylock, __libc_lock_unlock, __libc_lock_define_initialized_recursive, __rtld_lock_define_initialized_recursive, __libc_lock_init_recursive, __libc_lock_trylock_recursive, __libc_lock_lock_recursive, __libc_lock_unlock_recursive, __rtld_lock_initialize, __rtld_lock_trylock_recursive, __rtld_lock_lock_recursive, __rtld_lock_unlock_recursive __libc_once_define, __libc_mutex_unlock): Reimplement with lll. (__libc_lock_define_recursive, __rtld_lock_define_recursive, _LIBC_LOCK_RECURSIVE_INITIALIZER, _RTLD_LOCK_RECURSIVE_INITIALIZER): New macros. Include <libc-lockP.h> to reimplement libc_key* with pthread_key*. * hurd/hurdlock.c: New file. * hurd/hurdlock.h: New file. * mach/lowlevellock.h: New file
80 lines
3.1 KiB
Makefile
80 lines
3.1 KiB
Makefile
# Copyright (C) 1993-2018 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, see
|
|
# <http://www.gnu.org/licenses/>.
|
|
|
|
ifdef in-Makerules
|
|
|
|
# Look for header files in mach/ under the top-level library source directory.
|
|
# Look for generated header files where they get created.
|
|
includes += -I$(..)mach -I$(common-objpfx)mach/
|
|
|
|
ifneq (mach,$(subdir))
|
|
# Subdirectories other than mach/ might use the generated Mach headers.
|
|
# So make sure we get a chance to run in mach/ to make them before all else.
|
|
|
|
mach-objpfx = $(common-objpfx)mach/
|
|
else
|
|
mach-objpfx = $(objpfx)
|
|
endif
|
|
|
|
# These are all the generated files that <mach.h> includes.
|
|
# Actually, it's only some of them. We omit mach_interface.h
|
|
# because it's different in Darwin and the conditional crap is
|
|
# too much trouble. This should suffice for getting the mach/Makefile
|
|
# rules invoked when they need to be.
|
|
mach-before-compile := $(mach-objpfx)mach-shortcuts.h \
|
|
$(patsubst %,$(mach-objpfx)mach/mach_%.h,\
|
|
port host)
|
|
|
|
ifneq (mach,$(subdir))
|
|
# This patsubst generates patterns like `m%h-shortcuts.h', which are damn
|
|
# likely to match just the corresponding particular file we want.
|
|
$(patsubst mach%,m\%h%,$(mach-before-compile)): mach-before-compile # Run only if doesn't exist.
|
|
.PHONY: mach-before-compile
|
|
mach-before-compile:
|
|
$(MAKE) -C $(..)mach subdir=mach mach-before-compile no_deps=t generating=t
|
|
|
|
before-compile += $(mach-before-compile)
|
|
endif
|
|
|
|
ifeq (crypt,$(subdir))
|
|
LDLIBS-crypt.so += $(objdir)/mach/libmachuser.so
|
|
else ifeq (dlfcn,$(subdir))
|
|
LDLIBS-dl.so += $(objdir)/mach/libmachuser.so
|
|
else ifeq (nis,$(subdir))
|
|
LDLIBS-nsl.so += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-nss_nis.so += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-nss_nisplus.so += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so
|
|
else ifeq (nss,$(subdir))
|
|
LDLIBS-nss.so += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-nss_files.so += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-nss_db.so += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so
|
|
else ifeq (hesiod,$(subdir))
|
|
LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so
|
|
else ifeq (posix,$(subdir))
|
|
LDLIBS-tst-rfc3484 += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-tst-rfc3484-2 += $(objdir)/mach/libmachuser.so
|
|
LDLIBS-tst-rfc3484-3 += $(objdir)/mach/libmachuser.so
|
|
else ifeq (nscd,$(subdir))
|
|
LDLIBS-nscd += $(objdir)/mach/libmachuser.so
|
|
endif
|
|
|
|
LDLIBS-pthread.so += $(objdir)/mach/libmachuser.so
|
|
|
|
endif # in-Makerules
|