7c3018f9e4
This patch adds a new build module called 'testsuite'. IS_IN (testsuite) implies _ISOMAC, as do IS_IN_build and __cplusplus (which means several ad-hoc tests for __cplusplus can go away). libc-symbols.h now suppresses almost all of *itself* when _ISOMAC is defined; in particular, _ISOMAC mode does not get config.h automatically anymore. There are still quite a few tests that need to see internal gunk of one variety or another. For them, we now have 'tests-internal' and 'test-internal-extras'; files in this category will still be compiled with MODULE_NAME=nonlib, and everything proceeds as it always has. The bulk of this patch is moving tests from 'tests' to 'tests-internal'. There is also 'tests-static-internal', which has the same effect on files in 'tests-static', and 'modules-names-tests', which has the *inverse* effect on files in 'modules-names' (it's inverted because most of the things in modules-names are *not* tests). For both of these, the file must appear in *both* the new variable and the old one. There is also now a special case for when libc-symbols.h is included without MODULE_NAME being defined at all. (This happens during the creation of libc-modules.h, and also when preprocessing Versions files.) When this happens, IS_IN is set to be always false and _ISOMAC is *not* defined, which was the status quo, but now it's explicit. The remaining changes to C source files in this patch seemed likely to cause problems in the absence of the main change. They should be relatively self-explanatory. In a few cases I duplicated a definition from an internal header rather than move the test to tests-internal; this was a judgement call each time and I'm happy to change those however reviewers feel is more appropriate. * Makerules: New subdir configuration variables 'tests-internal' and 'test-internal-extras'. Test files in these categories will still be compiled with MODULE_NAME=nonlib. Test files in the existing categories (tests, xtests, test-srcs, test-extras) are now compiled with MODULE_NAME=testsuite. New subdir configuration variable 'modules-names-tests'. Files which are in both 'modules-names' and 'modules-names-tests' will be compiled with MODULE_NAME=testsuite instead of MODULE_NAME=extramodules. (gen-as-const-headers): Move to tests-internal. (do-tests-clean, common-mostlyclean): Support tests-internal. * Makeconfig (built-modules): Add testsuite. * Makefile: Change libof-check-installed-headers-c and libof-check-installed-headers-cxx to 'testsuite'. * Rules: Likewise. Support tests-internal. * benchtests/strcoll-inputs/filelist#en_US.UTF-8: Remove extra-modules.mk. * config.h.in: Don't check for __OPTIMIZE__ or __FAST_MATH__ here. * include/libc-symbols.h: Move definitions of _GNU_SOURCE, PASTE_NAME, PASTE_NAME1, IN_MODULE, IS_IN, and IS_IN_LIB to the very top of the file and rationalize their order. If MODULE_NAME is not defined at all, define IS_IN to always be false, and don't define _ISOMAC. If any of IS_IN (testsuite), IS_IN_build, or __cplusplus are true, define _ISOMAC and suppress everything else in this file, starting with the inclusion of config.h. Do check for inappropriate definitions of __OPTIMIZE__ and __FAST_MATH__ here, but only if _ISOMAC is not defined. Correct some out-of-date commentary. * include/math.h: If _ISOMAC is defined, undefine NO_LONG_DOUBLE and _Mlong_double_ before including math.h. * include/string.h: If _ISOMAC is defined, don't expose _STRING_ARCH_unaligned. Move a comment to a more appropriate location. * include/errno.h, include/stdio.h, include/stdlib.h, include/string.h * include/time.h, include/unistd.h, include/wchar.h: No need to check __cplusplus nor use __BEGIN_DECLS/__END_DECLS. * misc/sys/cdefs.h (__NTHNL): New macro. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h (__m81_defun): Use __NTHNL to avoid errors with GCC 6. * elf/tst-env-setuid-tunables.c: Include config.h with _LIBC defined, for HAVE_TUNABLES. * inet/tst-checks-posix.c: No need to define _ISOMAC. * intl/tst-gettext2.c: Provide own definition of N_. * math/test-signgam-finite-c99.c: No need to define _ISOMAC. * math/test-signgam-main.c: No need to define _ISOMAC. * stdlib/tst-strtod.c: Convert to test-driver. Split locale_test to... * stdlib/tst-strtod1i.c: ...this new file. * stdlib/tst-strtod5.c: Convert to test-driver and add copyright notice. Split tests of __strtod_internal to... * stdlib/tst-strtod5i.c: ...this new file. * string/test-string.h: Include stdint.h. Duplicate definition of inhibit_loop_to_libcall here (from libc-symbols.h). * string/test-strstr.c: Provide dummy definition of libc_hidden_builtin_def when including strstr.c. * sysdeps/ia64/fpu/libm-symbols.h: Suppress entire file in _ISOMAC mode; no need to test __STRICT_ANSI__ nor __cplusplus as well. * sysdeps/x86_64/fpu/math-tests-arch.h: Include cpu-features.h. Don't include init-arch.h. * sysdeps/x86_64/multiarch/test-multiarch.h: Include cpu-features.h. Don't include init-arch.h. * elf/Makefile: Move tst-ptrguard1-static, tst-stackguard1-static, tst-tls1-static, tst-tls2-static, tst-tls3-static, loadtest, unload, unload2, circleload1, neededtest, neededtest2, neededtest3, neededtest4, tst-tls1, tst-tls2, tst-tls3, tst-tls6, tst-tls7, tst-tls8, tst-dlmopen2, tst-ptrguard1, tst-stackguard1, tst-_dl_addr_inside_object, and all of the ifunc tests to tests-internal. Don't add $(modules-names) to test-extras. * inet/Makefile: Move tst-inet6_scopeid_pton to tests-internal. Add tst-deadline to tests-static-internal. * malloc/Makefile: Move tst-mallocstate and tst-scratch_buffer to tests-internal. * misc/Makefile: Move tst-atomic and tst-atomic-long to tests-internal. * nptl/Makefile: Move tst-typesizes, tst-rwlock19, tst-sem11, tst-sem12, tst-sem13, tst-barrier5, tst-signal7, tst-tls3, tst-tls3-malloc, tst-tls5, tst-stackguard1, tst-sem11-static, tst-sem12-static, and tst-stackguard1-static to tests-internal. Link tests-internal with libpthread also. Don't add $(modules-names) to test-extras. * nss/Makefile: Move tst-field to tests-internal. * posix/Makefile: Move bug-regex5, bug-regex20, bug-regex33, tst-rfc3484, tst-rfc3484-2, and tst-rfc3484-3 to tests-internal. * stdlib/Makefile: Move tst-strtod1i, tst-strtod3, tst-strtod4, tst-strtod5i, tst-tls-atexit, and tst-tls-atexit-nodelete to tests-internal. * sunrpc/Makefile: Move tst-svc_register to tests-internal. * sysdeps/powerpc/Makefile: Move test-get_hwcap and test-get_hwcap-static to tests-internal. * sysdeps/unix/sysv/linux/Makefile: Move tst-setgetname to tests-internal. * sysdeps/x86_64/fpu/Makefile: Add all libmvec test modules to modules-names-tests.
253 lines
9.0 KiB
Makefile
253 lines
9.0 KiB
Makefile
# Copyright (C) 1994-2017 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 sunrpc portion of the library.
|
||
#
|
||
subdir := sunrpc
|
||
|
||
include ../Makeconfig
|
||
|
||
# The code in this subdirectory is taken from Sun's RPCSRC-4.0
|
||
# distribution with some additional changes from the TI-RPC package
|
||
# which is also available from Sun. The files are heavily changed to
|
||
# compile cleanly and to fit in the GNU environment. All the code
|
||
# from Sun's rpc, etc, and rpcgen subdirectories is in this directory;
|
||
# the rpc subdirectory contains only the header files. Other than
|
||
# that, several files were renamed so as not to exceed 14-character
|
||
# file name limits:
|
||
#
|
||
# authunix_prot.c -> authuxprot.c
|
||
# bindresvport.c -> bindrsvprt.c
|
||
# clnt_generic.c -> clnt_gen.c
|
||
# clnt_perror.c -> clnt_perr.c
|
||
# clnt_simple.c -> clnt_simp.c
|
||
# get_myaddress.c -> get_myaddr.c
|
||
# pmap_getmaps.c -> pm_getmaps.c
|
||
# pmap_getport.c -> pm_getport.c
|
||
# rpc_callmsg.c -> rpc_cmsg.c
|
||
# rpc_commondata.c -> rpc_common.c
|
||
# rpc_dtablesize.c -> rpc_dtable.c
|
||
# svc_auth_unix.c -> svc_authux.c
|
||
# xdr_reference.c -> xdr_ref.c
|
||
|
||
rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \
|
||
yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
|
||
rusers.x spray.x nfs_prot.x rquota.x key_prot.x
|
||
headers-sunrpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
|
||
pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h \
|
||
svc.h svc_auth.h types.h xdr.h auth_des.h \
|
||
des_crypt.h key_prot.h rpc_des.h) \
|
||
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
|
||
headers = rpc/netdb.h
|
||
install-others = $(inst_sysconfdir)/rpc
|
||
generated += $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
|
||
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
|
||
generated-dirs += rpcsvc
|
||
|
||
ifeq ($(link-obsolete-rpc),yes)
|
||
headers += $(headers-sunrpc)
|
||
endif
|
||
|
||
ifeq ($(build-shared),yes)
|
||
need-export-routines := auth_des auth_unix clnt_gen clnt_perr clnt_tcp \
|
||
clnt_udp get_myaddr key_call netname pm_getport \
|
||
rpc_thread svc svc_tcp svc_udp xcrypt xdr_array xdr \
|
||
xdr_intXX_t xdr_mem xdr_ref xdr_sizeof xdr_stdio \
|
||
svc_run
|
||
|
||
routines := auth_none authuxprot bindrsvprt clnt_raw clnt_simp \
|
||
rpc_dtable getrpcport pmap_clnt pm_getmaps pmap_prot pmap_prot2 \
|
||
pmap_rmt rpc_prot rpc_common rpc_cmsg svc_auth svc_authux svc_raw \
|
||
svc_simple xdr_float xdr_rec publickey authdes_prot \
|
||
des_crypt des_impl des_soft key_prot openchild rtime svcauth_des \
|
||
getrpcent getrpcbyname getrpcbynumber \
|
||
getrpcent_r getrpcbyname_r getrpcbynumber_r \
|
||
clnt_unix svc_unix create_xid $(need-export-routines) \
|
||
rpc_gethostbyname
|
||
ifneq ($(link-obsolete-rpc),yes)
|
||
# We only add the RPC for compatibility to libc.so.
|
||
shared-only-routines = $(routines)
|
||
endif
|
||
endif
|
||
|
||
ifeq ($(link-obsolete-rpc),yes)
|
||
install-bin := rpcgen
|
||
rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
|
||
rpc_scan.o rpc_util.o rpc_svcout.o rpc_clntout.o \
|
||
rpc_tblout.o rpc_sample.o
|
||
extra-objs = $(rpcgen-objs) $(addprefix cross-,$(rpcgen-objs))
|
||
others += rpcgen
|
||
endif
|
||
|
||
tests = tst-xdrmem tst-xdrmem2 test-rpcent tst-udp-error tst-udp-timeout \
|
||
tst-udp-nonblocking
|
||
xtests := tst-getmyaddr
|
||
|
||
ifeq ($(have-thread-library),yes)
|
||
xtests += thrsvc
|
||
tests += tst-udp-garbage
|
||
tests-internal += tst-svc_register
|
||
endif
|
||
|
||
ifeq ($(run-built-tests),yes)
|
||
ifeq ($(link-obsolete-rpc),yes)
|
||
rpcgen-tests := $(objpfx)bug20790.out
|
||
tests-special += $(rpcgen-tests)
|
||
endif
|
||
endif
|
||
|
||
ifeq ($(link-obsolete-rpc),yes)
|
||
headers += $(rpcsvc:%.x=rpcsvc/%.h)
|
||
extra-libs := librpcsvc
|
||
extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass.
|
||
librpcsvc-routines = $(rpcsvc:%.x=x%)
|
||
librpcsvc-inhibit-o = .os # Build no shared rpcsvc library.
|
||
omit-deps = $(librpcsvc-routines)
|
||
endif
|
||
|
||
ifeq (yes,$(build-shared))
|
||
rpc-compat-routines = $(addprefix compat-,$(need-export-routines))
|
||
rpc-compat-routines.os = $(addprefix $(objpfx), \
|
||
$(addsuffix .os,$(rpc-compat-routines)))
|
||
extra-objs += $(addsuffix .os,$(rpc-compat-routines))
|
||
endif
|
||
|
||
include ../Rules
|
||
|
||
ifeq (yes,$(build-shared))
|
||
subdir_lib: $(objpfx)librpc_compat_pic.a
|
||
$(objpfx)librpc_compat_pic.a: $(rpc-compat-routines.os)
|
||
$(AR) cr$(verbose) $@ $^
|
||
$(rpc-compat-routines.os): $(objpfx)compat-%.os: %.c $(before-compile)
|
||
$(compile-command.c) -DEXPORT_RPC_SYMBOLS
|
||
endif
|
||
|
||
CFLAGS-xbootparam_prot.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xnlm_prot.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xrstat.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xyppasswd.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xklm_prot.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xrex.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xsm_inter.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xmount.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xrusers.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xspray.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xnfs_prot.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xrquota.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-xkey_prot.c = -Wno-unused $(PIC-ccflag)
|
||
CFLAGS-auth_unix.c = -fexceptions
|
||
CFLAGS-key_call.c = -fexceptions
|
||
CFLAGS-pmap_rmt.c = -fexceptions
|
||
CFLAGS-clnt_perr.c = -fexceptions
|
||
CFLAGS-openchild.c = -fexceptions
|
||
|
||
sunrpc-CPPFLAGS = -D_RPC_THREAD_SAFE_
|
||
CPPFLAGS += $(sunrpc-CPPFLAGS)
|
||
BUILD_CPPFLAGS += $(sunrpc-CPPFLAGS)
|
||
|
||
$(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
|
||
$(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
|
||
$(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
|
||
$(objpfx)tst-udp-error: $(common-objpfx)linkobj/libc.so
|
||
$(objpfx)tst-svc_register: \
|
||
$(common-objpfx)linkobj/libc.so $(shared-thread-library)
|
||
|
||
$(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs))
|
||
|
||
cross-rpcgen-objs := $(addprefix $(objpfx)cross-,$(rpcgen-objs))
|
||
|
||
# When generic makefile support for build system programs is
|
||
# available, it should replace this code. See
|
||
# <http://sourceware.org/bugzilla/show_bug.cgi?id=14087>.
|
||
$(cross-rpcgen-objs): $(objpfx)cross-%.o: %.c $(before-compile)
|
||
$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) $< \
|
||
$(OUTPUT_OPTION) $(native-compile-mkdep-flags) -c
|
||
|
||
$(objpfx)cross-rpcgen: $(cross-rpcgen-objs)
|
||
$(BUILD_CC) $^ $(BUILD_LDFLAGS) -o $@
|
||
|
||
# This makes sure -DIN_MODULE is passed for all these modules.
|
||
cpp-srcs-left := $(rpcgen-objs:.o=.c)
|
||
lib := nonlib
|
||
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
|
||
|
||
# How we run rpcgen to generate sources and headers in the rules below.
|
||
# Setting CPP tells it how to run the C preprocessor correctly. Note
|
||
# that $(built-program-file) requires that the just-built cross-rpcgen
|
||
# binary be the second dependency listed in each rule using rpcgen-cmd.
|
||
rpcgen-cmd = CPP='$(CC) -E -x c-header' $(built-program-file) -Y ../scripts
|
||
|
||
# Install the rpc data base file.
|
||
$(inst_sysconfdir)/rpc: etc.rpc $(+force)
|
||
$(do-install)
|
||
|
||
# Generate the rpcsvc headers with rpcgen.
|
||
# We use a stamp file to avoid unnessary recompilation each time rpcgen is
|
||
# relinked.
|
||
$(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp
|
||
@:
|
||
$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)cross-rpcgen
|
||
$(make-target-directory)
|
||
-@rm -f ${@:stmp=T} $@
|
||
$(rpcgen-cmd) -h $< -o ${@:stmp=T}
|
||
$(move-if-change) $(@:stmp=T) $(@:stmp=h)
|
||
touch $@
|
||
|
||
# Generate the rpcsvc XDR functions with rpcgen.
|
||
$(rpcsvc:%.x=$(objpfx)x%.c): $(objpfx)x%.c: $(objpfx)x%.stmp
|
||
@:
|
||
$(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)cross-rpcgen
|
||
-@rm -f ${@:stmp=T} $@
|
||
$(rpcgen-cmd) -c $< -o ${@:stmp=T}
|
||
$(move-if-change) $(@:stmp=T) $(@:stmp=c)
|
||
touch $@
|
||
|
||
# The generated source files depend on the corresponding generated headers.
|
||
# Gratuitous dependency on generated .c file here just gets it mentioned to
|
||
# avoid being an intermediate file and getting removed.
|
||
define o-iterator-doit
|
||
$(rpcsvc:%.x=$(objpfx)x%$o): $(objpfx)x%$o: $(objpfx)x%.c $(objpfx)rpcsvc/%.h
|
||
endef
|
||
object-suffixes-left = $(filter-out $(librpcsvc-inhibit-o),$(object-suffixes))
|
||
include $(o-iterator)
|
||
|
||
rpcsvc-dt-files := $(foreach o,$(filter-out $(librpcsvc-inhibit-o),\
|
||
$(object-suffixes)),\
|
||
$(rpcsvc:%.x=$(objpfx)x%$o.dt))
|
||
rpcsvc-depfiles := $(patsubst %.dt,%.d,$(wildcard $(rpcsvc-dt-files))) \
|
||
$(wildcard $(rpcsvc-dt-files:.dt=.d))
|
||
ifdef rpcsvc-depfiles
|
||
ifneq ($(no_deps),t)
|
||
-include $(rpcsvc-depfiles)
|
||
endif
|
||
endif
|
||
|
||
$(objpfx)thrsvc: $(common-objpfx)linkobj/libc.so $(shared-thread-library)
|
||
|
||
ifeq ($(run-built-tests),yes)
|
||
$(rpcgen-tests): $(objpfx)%.out: %.x $(objpfx)rpcgen
|
||
-rm -f $@
|
||
$(built-program-cmd) -c $< -o $@; \
|
||
$(evaluate-test)
|
||
endif
|
||
|
||
$(objpfx)tst-udp-timeout: $(common-objpfx)linkobj/libc.so
|
||
$(objpfx)tst-udp-nonblocking: $(common-objpfx)linkobj/libc.so
|
||
$(objpfx)tst-udp-garbage: \
|
||
$(common-objpfx)linkobj/libc.so $(shared-thread-library)
|