mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
a5f891ac8d
In <https://sourceware.org/ml/libc-alpha/2014-01/msg00196.html> I noted it was necessary to add includes of Makeconfig early in various subdirectory makefiles for the tests-special variable settings added by that patch to be conditional on configuration information. No-one commented on the general question there of whether Makeconfig should always be included immediately after the definition of subdir. This patch implements that early inclusion of Makeconfig in each directory (which is a lot easier than consistent placement of includes of Rules). Includes are added if needed, or moved up if already present. Subdirectory "all:" targets are removed, since Makeconfig provides one. There is potential for further cleanups I haven't done. Rules and Makerules have code such as ifneq "$(findstring env,$(origin headers))" "" headers := endif to override to empty any value of various variables that came from the environment. I think there is a case for Makeconfig setting all the subdirectory variables (other than subdir) to empty to ensure no outside value is going to take effect if a subdirectory fails to define a variable. (A list of such variables, possibly out of date and incomplete, is in manual/maint.texi.) Rules and Makerules would give errors if Makeconfig hadn't already been included, instead of including it themselves. The special code to override values coming from the environment would then be obsolete and could be removed. Tested x86_64, including that installed binaries are identical before and after the patch. * argp/Makefile: Include Makeconfig immediately after defining subdir. * assert/Makefile: Likewise. * benchtests/Makefile: Likewise. * catgets/Makefile: Likewise. * conform/Makefile: Likewise. * crypt/Makefile: Likewise. * csu/Makefile: Likewise. (all): Remove target. * ctype/Makefile: Include Makeconfig immediately after defining subdir. * debug/Makefile: Likewise. * dirent/Makefile: Likewise. * dlfcn/Makefile: Likewise. * gmon/Makefile: Likewise. * gnulib/Makefile: Likewise. * grp/Makefile: Likewise. * gshadow/Makefile: Likewise. * hesiod/Makefile: Likewise. * hurd/Makefile: Likewise. (all): Remove target. * iconvdata/Makefile: Include Makeconfig immediately after defining subdir. * inet/Makefile: Likewise. * intl/Makefile: Likewise. * io/Makefile: Likewise. * libio/Makefile: Likewise. (all): Remove target. * locale/Makefile: Include Makeconfig immediately after defining subdir. * login/Makefile: Likewise. * mach/Makefile: Likewise. (all): Remove target. * malloc/Makefile: Include Makeconfig immediately after defining subdir. (all): Remove target. * manual/Makefile: Include Makeconfig immediately after defining subdir. * math/Makefile: Likewise. * misc/Makefile: Likewise. * nis/Makefile: Likewise. * nss/Makefile: Likewise. * po/Makefile: Likewise. (all): Remove target. * posix/Makefile: Include Makeconfig immediately after defining subdir. * pwd/Makefile: Likewise. * resolv/Makefile: Likewise. * resource/Makefile: Likewise. * rt/Makefile: Likewise. * setjmp/Makefile: Likewise. * shadow/Makefile: Likewise. * signal/Makefile: Likewise. * socket/Makefile: Likewise. * soft-fp/Makefile: Likewise. * stdio-common/Makefile: Likewise. * stdlib/Makefile: Likewise. * streams/Makefile: Likewise. * string/Makefile: Likewise. * sunrpc/Makefile: Likewise. (all): Remove target. * sysvipc/Makefile: Include Makeconfig immediately after defining subdir. * termios/Makefile: Likewise. * time/Makefile: Likewise. * timezone/Makefile: Likewise. (all): Remove target. * wcsmbs/Makefile: Include Makeconfig immediately after defining subdir. * wctype/Makefile: Likewise. libidn/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir. localedata/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir. (all): Remove target. nptl/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir. nptl_db/ChangeLog: * Makefile: Include Makeconfig immediately after defining subdir.
78 lines
2.6 KiB
Makefile
78 lines
2.6 KiB
Makefile
# Copyright (C) 1997-2014 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/>.
|
|
|
|
#
|
|
# Sub-makefile for real-time portion of the library.
|
|
#
|
|
subdir := rt
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := aio.h mqueue.h bits/mqueue.h bits/mqueue2.h
|
|
|
|
aio-routines := aio_cancel aio_error aio_fsync aio_misc aio_read \
|
|
aio_read64 aio_return aio_suspend aio_write \
|
|
aio_write64 lio_listio lio_listio64 aio_sigqueue \
|
|
aio_notify
|
|
clock-routines := get_clockfreq clock_getcpuclockid \
|
|
clock_getres clock_gettime clock_settime \
|
|
clock_nanosleep
|
|
timer-routines := timer_create timer_delete timer_getoverr \
|
|
timer_gettime timer_settime
|
|
shm-routines := shm_open shm_unlink
|
|
mq-routines := mq_open mq_close mq_unlink mq_getattr mq_setattr \
|
|
mq_notify mq_send mq_receive mq_timedsend \
|
|
mq_timedreceive
|
|
|
|
routines = $(clock-routines)
|
|
|
|
librt-routines = $(aio-routines) \
|
|
$(timer-routines) \
|
|
$(shm-routines) $(mq-routines) \
|
|
clock-compat
|
|
|
|
tests := tst-shm tst-clock tst-clock_nanosleep tst-timer tst-timer2 \
|
|
tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \
|
|
tst-aio7 tst-aio8 tst-aio9 tst-aio10 \
|
|
tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \
|
|
tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-mqueue8 tst-mqueue9 \
|
|
tst-timer3 tst-timer4 tst-timer5 \
|
|
tst-cpuclock1 tst-cpuclock2 \
|
|
tst-cputimer1 tst-cputimer2 tst-cputimer3 \
|
|
tst-clock2
|
|
|
|
extra-libs := librt
|
|
extra-libs-others := $(extra-libs)
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-aio_suspend.c = -fexceptions
|
|
CFLAGS-clock_nanosleep.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-librt-cancellation.c = -fasynchronous-unwind-tables
|
|
|
|
LDFLAGS-rt.so = -Wl,--enable-new-dtags,-z,nodelete
|
|
|
|
$(objpfx)librt.so: $(shared-thread-library)
|
|
|
|
ifeq (yes,$(build-shared))
|
|
$(addprefix $(objpfx),$(tests)): $(objpfx)librt.so $(shared-thread-library)
|
|
else
|
|
$(addprefix $(objpfx),$(tests)): $(objpfx)librt.a $(static-thread-library)
|
|
endif
|
|
|
|
tst-mqueue7-ARGS = -- $(host-test-program-cmd)
|