mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
79520f4bd6
glibc's Makeconfig defines some variables such as $(libm) and $(libdl) for linking with libraries built by glibc, and nptl/Makeconfig (included by the toplevel Makeconfig) defines others such as $(shared-thread-library). In some places glibc's Makefiles use those variables when linking against the relevant libraries, but in other places they hardcode the location of the libraries in the build tree. This patch cleans up various places to use the variables that already exist (in the case of libm, replacing several duplicate definitions of a $(link-libm) variable in subdirectory Makefiles). (It's not necessarily exactly equivalent to what the existing code does - in particular, $(shared-thread-library) includes libpthread_nonshared, but is replacing places that just referred to libpthread.so. But I think that change is desirable on the general principle of linking things as close as possible to the way in which they would be linked with an installed library, unless there is a clear reason not to do so.) To support running tests with an installed copy of glibc without needing the full build tree from when that copy was built, I think it will be useful to use such variables more generally and systematically - every time the rules for building a test refer to some file from the build tree that's also installed by glibc, use a makefile variable so that the installed-testing case can point those variables to installed copies of the files. This patch just deals with straightforward cases where such variables already exist. It's quite possible some uses of $(shared-thread-library) should actually be a new $(thread-library) variable that's set appropriately in the --disable-shared case, if those uses would in fact work without shared libraries. I didn't change the status quo that those cases hardcode use of a shared library whether or not it's actually needed (but other uses such as $(libm) and $(libdl) would now get the static library if the shared library isn't built, when some previously hardcoded use of the shared library - if they actually need shared libraries, the test itself needs an enable-shared conditional anyway). Tested x86_64. * benchtests/Makefile ($(addprefix $(objpfx)bench-,$(bench-math))): Depend on $(libm), not $(common-objpfx)math/libm.so. ($(addprefix $(objpfx)bench-,$(bench-pthread))): Depend on $(shared-thread-library), not $(common-objpfx)nptl/libpthread.so. * elf/Makefile ($(objpfx)noload): Depend on $(libdl), not $(common-objpfx)dlfcn/libdl.so. ($(objpfx)tst-audit8): Depend on $(libm), not $(common-objpfx)math/libm.so. * malloc/Makefile ($(objpfx)libmemusage.so): Depend on $(libdl), not $(common-objpfx)dlfcn/libdl.so. * math/Makefile ($(addprefix $(objpfx),$(filter-out $(tests-static),$(tests)))): Depend on $(libm), not $(objpfx)libm.so. Do not condition on [$(build-shared) = yes]. ($(objpfx)test-fenv-tls): Depend on $(shared-thread-library), not $(common-objpfx)nptl/libpthread.so. * misc/Makefile ($(objpfx)tst-tsearch): Depend on $(libm), not $(common-objpfx)math/libm.so$(libm.so-version) or $(common-objpfx)math/libm.a depending on [$(build-shared) = yes]. * nptl/Makefile ($(objpfx)tst-unload): Depend on $(libdl), not $(common-objpfx)dlfcn/libdl.so. * setjmp/Makefile (link-libm): Remove variable. ($(objpfx)tst-setjmp-fp): Depend on $(libm), not $(link-libm). * stdio-common/Makefile (link-libm): Remove variable. ($(objpfx)tst-printf-round): Depend on $(libm), not $(link-libm). * stdlib/Makefile (link-libm): Remove variable. ($(objpfx)bug-getcontext): Depend on $(libm), not $(link-libm). ($(objpfx)tst-strtod-round): Likewise. ($(objpfx)tst-tininess): Likewise. ($(objpfx)tst-strtod-underflow): Likewise. ($(objpfx)tst-strtod6): Likewise. ($(objpfx)tst-tls-atexit): Depend on $(shared-thread-library) and $(libdl), not $(common-objpfx)nptl/libpthread.so and $(common-objpfx)dlfcn/libdl.so.
112 lines
3.9 KiB
Makefile
112 lines
3.9 KiB
Makefile
# Copyright (C) 1991-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 misc portion of the library.
|
|
#
|
|
|
|
subdir := misc
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
|
|
sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
|
|
ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
|
|
ttyent.h paths.h sys/reboot.h \
|
|
sys/mman.h sys/param.h bits/param.h \
|
|
fstab.h mntent.h search.h err.h error.h \
|
|
sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
|
|
sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \
|
|
regexp.h bits/select.h bits/mman.h sys/xattr.h \
|
|
syslog.h sys/syslog.h \
|
|
bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \
|
|
bits/select2.h bits/hwcap.h sys/auxv.h
|
|
|
|
routines := brk sbrk sstk ioctl \
|
|
readv writev preadv preadv64 pwritev pwritev64 \
|
|
setreuid setregid \
|
|
seteuid setegid \
|
|
getpagesize \
|
|
getdtsz \
|
|
gethostname sethostname getdomain setdomain \
|
|
select pselect \
|
|
acct chroot fsync sync fdatasync syncfs reboot \
|
|
gethostid sethostid \
|
|
revoke vhangup \
|
|
swapon swapoff mktemp mkstemp mkstemp64 mkdtemp \
|
|
mkostemp mkostemp64 mkstemps mkstemps64 mkostemps mkostemps64 \
|
|
ualarm usleep \
|
|
gtty stty \
|
|
ptrace \
|
|
fstab mntent mntent_r \
|
|
utimes lutimes futimes futimesat \
|
|
truncate ftruncate truncate64 ftruncate64 \
|
|
chflags fchflags \
|
|
insremque getttyent getusershell getpass ttyslot \
|
|
syslog syscall daemon \
|
|
mmap mmap64 munmap mprotect msync madvise mincore remap_file_pages\
|
|
mlock munlock mlockall munlockall \
|
|
efgcvt efgcvt_r qefgcvt qefgcvt_r \
|
|
hsearch hsearch_r tsearch lsearch \
|
|
err error ustat \
|
|
getsysstats dirname regexp \
|
|
getloadavg getclktck \
|
|
fgetxattr flistxattr fremovexattr fsetxattr getxattr \
|
|
listxattr lgetxattr llistxattr lremovexattr lsetxattr \
|
|
removexattr setxattr getauxval ifunc-impl-list
|
|
|
|
generated += tst-error1.mtrace tst-error1-mem.out
|
|
|
|
aux := init-misc
|
|
install-lib := libg.a
|
|
gpl2lgpl := error.c error.h
|
|
|
|
tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \
|
|
tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1
|
|
ifeq ($(run-built-tests),yes)
|
|
tests-special += $(objpfx)tst-error1-mem.out
|
|
endif
|
|
|
|
CFLAGS-select.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-tsearch.c = $(uses-callbacks)
|
|
CFLAGS-lsearch.c = $(uses-callbacks)
|
|
CFLAGS-pselect.c = -fexceptions
|
|
CFLAGS-readv.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-writev.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-usleep.c = -fexceptions
|
|
CFLAGS-syslog.c = -fexceptions
|
|
CFLAGS-error.c = -fexceptions
|
|
CFLAGS-getpass.c = -fexceptions
|
|
CFLAGS-mkstemp.c = -fexceptions
|
|
CFLAGS-mkstemp64.c = -fexceptions
|
|
CFLAGS-getsysstats.c = -fexceptions
|
|
CFLAGS-getusershell.c = -fexceptions
|
|
CFLAGS-err.c = -fexceptions
|
|
CFLAGS-tst-tsearch.c = $(stack-align-test-flags)
|
|
|
|
include ../Rules
|
|
|
|
$(objpfx)libg.a: $(dep-dummy-lib); $(make-dummy-lib)
|
|
|
|
$(objpfx)tst-tsearch: $(libm)
|
|
|
|
tst-error1-ENV = MALLOC_TRACE=$(objpfx)tst-error1.mtrace
|
|
tst-error1-ARGS = $(objpfx)tst-error1.out
|
|
$(objpfx)tst-error1-mem.out: $(objpfx)tst-error1.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-error1.mtrace > $@; \
|
|
$(evaluate-test)
|