mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 22:40:05 +00:00
36861a968a
This reduces RSS usage if nss_files is not actually used, and can
be used later to make NSS data thread-specific. It also results in
a small code size reduction.
Before:
text data bss dec hex filename
2288 0 72 2360 938 nss/files-alias.os
1807 0 72 1879 757 nss/files-ethers.os
1371 0 72 1443 5a3 nss/files-grp.os
6246 0 72 6318 18ae nss/files-hosts.os
869 0 0 869 365 nss/files-initgroups.os
666 0 0 666 29a nss/files-init.os
1934 0 0 1934 78e nss/files-netgrp.os
2353 0 72 2425 979 nss/files-network.os
2130 0 72 2202 89a nss/files-proto.os
1372 0 72 1444 5a4 nss/files-pwd.os
2124 0 72 2196 894 nss/files-rpc.os
2265 0 72 2337 921 nss/files-service.os
1125 0 72 1197 4ad nss/files-sgrp.os
1124 0 72 1196 4ac nss/files-spwd.os
After:
text data bss dec hex filename
2040 0 0 2040 7f8 nss/files-alias.os
1599 0 0 1599 63f nss/files-ethers.os
1155 0 0 1155 483 nss/files-grp.os
6010 0 0 6010 177a nss/files-hosts.os
869 0 0 869 365 nss/files-initgroups.os
666 0 0 666 29a nss/files-init.os
1934 0 0 1934 78e nss/files-netgrp.os
2129 0 0 2129 851 nss/files-network.os
1914 0 0 1914 77a nss/files-proto.os
1156 0 0 1156 484 nss/files-pwd.os
1908 0 0 1908 774 nss/files-rpc.os
2057 0 0 2057 809 nss/files-service.os
909 0 0 909 38d nss/files-sgrp.os
908 0 0 908 38c nss/files-spwd.os
1090 0 8 1098 44a nss/nss_files_data.os
27674 code bytes before, 26344 code bytes after, so it is an overall
win despite the extra initialization code.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
186 lines
5.7 KiB
Makefile
186 lines
5.7 KiB
Makefile
# Copyright (C) 1996-2021 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
|
|
# <https://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
# Makefile for name service switch.
|
|
#
|
|
subdir := nss
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := nss.h
|
|
|
|
# This is the trivial part which goes into libc itself.
|
|
routines = nsswitch getnssent getnssent_r digits_dots \
|
|
valid_field valid_list_field rewrite_field \
|
|
$(addsuffix -lookup,$(databases)) \
|
|
compat-lookup nss_hash nss_files_fopen \
|
|
nss_readline nss_parse_line_result \
|
|
nss_fgetent_r nss_module nss_action \
|
|
nss_action_parse nss_database nss_files_data
|
|
|
|
# These are the databases that go through nss dispatch.
|
|
# Caution: if you add a database here, you must add its real name
|
|
# in databases.def, too.
|
|
databases = proto service hosts network grp pwd ethers \
|
|
spwd netgrp alias sgrp
|
|
|
|
ifneq (,$(filter sunrpc,$(subdirs)))
|
|
databases += key rpc
|
|
have-sunrpc := 1
|
|
else
|
|
have-sunrpc := 0
|
|
endif
|
|
CPPFLAGS-getent.c = -DHAVE_SUNRPC=$(have-sunrpc)
|
|
|
|
others := getent makedb
|
|
install-bin := getent makedb
|
|
makedb-modules = xmalloc hash-string
|
|
others-extras = $(makedb-modules)
|
|
extra-objs += $(makedb-modules:=.o)
|
|
|
|
tests-static = tst-field
|
|
tests-internal = tst-field
|
|
tests = test-netdb test-digits-dots tst-nss-getpwent bug17079 \
|
|
tst-nss-test1 \
|
|
tst-nss-test2 \
|
|
tst-nss-test4 \
|
|
tst-nss-test5
|
|
xtests = bug-erange
|
|
|
|
tests-container = \
|
|
tst-nss-compat1 \
|
|
tst-nss-test3 \
|
|
tst-nss-files-hosts-long \
|
|
tst-nss-db-endpwent \
|
|
tst-nss-db-endgrent \
|
|
tst-reload1 tst-reload2
|
|
|
|
# Tests which need libdl
|
|
ifeq (yes,$(build-shared))
|
|
tests += tst-nss-files-hosts-erange
|
|
tests += tst-nss-files-hosts-multi
|
|
tests += tst-nss-files-hosts-getent
|
|
tests += tst-nss-files-alias-leak
|
|
tests += tst-nss-files-alias-truncated
|
|
endif
|
|
|
|
# If we have a thread library then we can test cancellation against
|
|
# some routines like getpwuid_r.
|
|
ifeq (yes,$(have-thread-library))
|
|
tests += tst-cancel-getpwuid_r
|
|
endif
|
|
|
|
# Specify rules for the nss_* modules. We have some services.
|
|
services := files db compat
|
|
|
|
extra-libs = $(services:%=libnss_%)
|
|
# These libraries will be built in the `others' pass rather than
|
|
# the `lib' pass, because they depend on libc.so being built already.
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
# The sources are found in the appropriate subdir.
|
|
subdir-dirs = $(services:%=nss_%)
|
|
vpath %.c $(subdir-dirs) ../locale/programs ../intl
|
|
|
|
|
|
libnss_files-routines := $(addprefix files-, \
|
|
$(filter-out key, $(databases))) \
|
|
files-initgroups files-init
|
|
|
|
libnss_db-dbs := $(addprefix db-,\
|
|
$(filter-out hosts network key alias,\
|
|
$(databases))) \
|
|
db-initgroups
|
|
libnss_db-routines := $(libnss_db-dbs) db-open db-init hash-string
|
|
generated += $(filter-out db-alias.c db-netgrp.c, \
|
|
$(addsuffix .c,$(libnss_db-dbs)))
|
|
|
|
libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) \
|
|
nisdomain
|
|
|
|
install-others += $(inst_vardbdir)/Makefile
|
|
|
|
# Build static module into libc if requested
|
|
libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
libnss_db-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes))
|
|
ifeq ($(build-static-nss),yes)
|
|
routines += $(libnss_files-routines)
|
|
static-only-routines += $(libnss_files-routines)
|
|
tests-static += tst-nss-static
|
|
endif
|
|
extra-test-objs += nss_test1.os nss_test2.os
|
|
|
|
include ../Rules
|
|
|
|
ifeq (yes,$(have-selinux))
|
|
LDLIBS-makedb := -lselinux
|
|
endif
|
|
|
|
libnss-libc = $(common-objpfx)linkobj/libc.so
|
|
# Target-specific variable setting to link objects using deprecated
|
|
# RPC interfaces with the version of libc.so that makes them available
|
|
# for new links:
|
|
$(services:%=$(objpfx)libnss_%.so): libc-for-link = $(libnss-libc)
|
|
|
|
$(objpfx)libnss_db.so: $(objpfx)libnss_files.so
|
|
|
|
$(libnss_db-dbs:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
|
|
@rm -f $@.new
|
|
(echo '#define EXTERN_PARSER';\
|
|
echo '#define GENERIC "../nss_db/db-XXX.c"';\
|
|
echo '#include "$<"') > $@.new
|
|
mv -f $@.new $@
|
|
|
|
|
|
$(objpfx)makedb: $(makedb-modules:%=$(objpfx)%.o)
|
|
|
|
$(inst_vardbdir)/Makefile: db-Makefile $(+force)
|
|
$(do-install)
|
|
|
|
libnss_test1.so-no-z-defs = 1
|
|
libnss_test2.so-no-z-defs = 1
|
|
|
|
rtld-tests-LDFLAGS += -Wl,--dynamic-list=nss_test.ver
|
|
|
|
libof-nss_test1 = extramodules
|
|
libof-nss_test2 = extramodules
|
|
$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
|
|
$(build-module)
|
|
$(objpfx)/libnss_test2.so: $(objpfx)nss_test2.os $(link-libc-deps)
|
|
$(build-module)
|
|
$(objpfx)nss_test2.os : nss_test1.c
|
|
ifdef libnss_test1.so-version
|
|
$(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so
|
|
$(make-link)
|
|
endif
|
|
ifdef libnss_test2.so-version
|
|
$(objpfx)/libnss_test2.so$(libnss_test2.so-version): $(objpfx)/libnss_test2.so
|
|
$(make-link)
|
|
endif
|
|
$(patsubst %,$(objpfx)%.out,$(tests) $(tests-container)) : \
|
|
$(objpfx)/libnss_test1.so$(libnss_test1.so-version) \
|
|
$(objpfx)/libnss_test2.so$(libnss_test2.so-version)
|
|
|
|
ifeq (yes,$(have-thread-library))
|
|
$(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
|
|
endif
|
|
|
|
$(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so
|
|
$(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so
|