2020-01-01 00:14:33 +00:00
|
|
|
# Copyright (C) 1993-2020 Free Software Foundation, Inc.
|
1995-02-18 01:27:10 +00:00
|
|
|
# This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
# 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.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
# 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
|
2001-07-06 04:58:11 +00:00
|
|
|
# Lesser General Public License for more details.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
# License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
# <https://www.gnu.org/licenses/>.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
ifdef in-Makerules
|
|
|
|
|
|
|
|
# Look for header files in mach/ under the top-level library source directory.
|
1996-09-13 06:22:21 +00:00
|
|
|
# Look for generated header files where they get created.
|
|
|
|
includes += -I$(..)mach -I$(common-objpfx)mach/
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
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.
|
|
|
|
|
1996-08-30 00:58:28 +00:00
|
|
|
mach-objpfx = $(common-objpfx)mach/
|
2003-02-15 22:59:19 +00:00
|
|
|
else
|
|
|
|
mach-objpfx = $(objpfx)
|
|
|
|
endif
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
# These are all the generated files that <mach.h> includes.
|
2002-02-17 07:22:56 +00:00
|
|
|
# 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.
|
1995-02-18 01:27:10 +00:00
|
|
|
mach-before-compile := $(mach-objpfx)mach-shortcuts.h \
|
|
|
|
$(patsubst %,$(mach-objpfx)mach/mach_%.h,\
|
2002-02-17 07:22:56 +00:00
|
|
|
port host)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
2003-02-15 22:59:19 +00:00
|
|
|
ifneq (mach,$(subdir))
|
1995-02-18 01:27:10 +00:00
|
|
|
# This patsubst generates patterns like `m%h-shortcuts.h', which are damn
|
|
|
|
# likely to match just the corresponding particular file we want.
|
2015-09-07 23:26:01 +00:00
|
|
|
$(patsubst mach%,m\%h%,$(mach-before-compile)): mach-before-compile # Run only if doesn't exist.
|
|
|
|
.PHONY: mach-before-compile
|
|
|
|
mach-before-compile:
|
2015-09-06 19:07:00 +00:00
|
|
|
$(MAKE) -C $(..)mach subdir=mach mach-before-compile no_deps=t generating=t
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
before-compile += $(mach-before-compile)
|
|
|
|
endif
|
|
|
|
|
hurd: Reimplement libc locks using mach's gsync
* 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
2018-03-18 17:22:55 +00:00
|
|
|
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_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
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
endif # in-Makerules
|