mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
9cd4747089
The current scheme to identify which module a translation unit is built in depends on defining multiple macros IS_IN_* and also defining NOT_IN_libc if we're building a non-libc module. In addition, there is an IN_LIB macro that does effectively the same thing, but for different modules (notably the systemtap probes). This macro scheme unifies both ideas to use just one macro IN_MODULE and assign it a value depending on the module it is being built into. If the module is not defined, it defaults to MODULE_libc. Patches that follow will replace uses of IS_IN_* variables with the IS_IN() macro. libc-symbols.h has been converted already to give an example of how such a transition will look. Verified that there are no relevant binary changes. One source change that will crop up repeatedly is that of nscd_stat, since it uses the build timestamp as a constant in its logic. * Makeconfig (in-module): Get value of libof set for the translation unit. (CPPFLAGS): Use $(in-module). * Makerules: Don't suffix routine names for nonlib. * include/libc-modules.h: New file. * include/libc-symbols.h: Include libc-modules.h (IS_IN): New macro to replace IS_IN_* macros. * elf/Makefile: Set libof-* for each routine. * elf/rtld-Rules: Likewise. * extra-modules.mk: Likewise. * iconv/Makefile: Likewise. * iconvdata/Makefile: Likewise. * locale/Makefile: Likewise. * malloc/Makefile: Likewise. * nss/Makefile: Likewise. * sysdeps/gnu/Makefile: Likewise. * sysdeps/ieee754/ldbl-opt/Makefile: Likewise. * sysdeps/unix/sysv/linux/Makefile: Likewise. * sysdeps/s390/s390-64/Makefile: Likewise. * nscd/Makefile: Set libof-* for each routine. Set CFLAGS and CPPFLAGS for nscd instead of nonlib.
107 lines
3.0 KiB
Makefile
107 lines
3.0 KiB
Makefile
# Copyright (C) 1998-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 nscd portion of the library.
|
|
#
|
|
subdir := nscd
|
|
|
|
include ../Makeconfig
|
|
|
|
ifneq ($(use-nscd),no)
|
|
routines := nscd_getpw_r nscd_getgr_r nscd_gethst_r nscd_getai \
|
|
nscd_initgroups nscd_getserv_r nscd_netgroup
|
|
aux := nscd_helper
|
|
endif
|
|
|
|
# To find xmalloc.c
|
|
vpath %.c ../locale/programs
|
|
|
|
nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
|
|
getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
|
|
getsrvbynm_r getsrvbypt_r servicescache \
|
|
dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
|
|
xmalloc xstrdup aicache initgrcache gai res_hconf \
|
|
netgroupcache
|
|
|
|
ifeq ($(build-nscd)$(have-thread-library),yesyes)
|
|
|
|
others += nscd
|
|
others-pie += nscd
|
|
install-sbin := nscd
|
|
|
|
extra-objs = $(nscd-modules:=.o)
|
|
|
|
endif
|
|
|
|
all-nscd-modules := $(nscd-modules) selinux
|
|
ifeq (yes,$(have-selinux))
|
|
ifeq (yes,$(have-libaudit))
|
|
libaudit = -laudit
|
|
ifeq (yes,$(have-libcap))
|
|
libcap = -lcap
|
|
endif
|
|
endif
|
|
|
|
nscd-modules += selinux
|
|
selinux-LIBS := -lselinux $(libaudit) $(libcap)
|
|
|
|
# The configure.ac check for libselinux and its headers did not use
|
|
# $SYSINCLUDES. The directory specified by --with-headers usually
|
|
# contains only the basic kernel interface headers, not something like
|
|
# libselinux. So the simplest thing is to presume that the standard
|
|
# system headers will be ok for this file.
|
|
$(objpfx)nscd_stat.o: sysincludes = # nothing
|
|
$(objpfx)selinux.o: sysincludes = # nothing
|
|
endif
|
|
|
|
LDLIBS-nscd = $(selinux-LIBS)
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-nscd_getpw_r.c = -fexceptions
|
|
CFLAGS-nscd_getgr_r.c = -fexceptions
|
|
CFLAGS-nscd_gethst_r.c = -fexceptions
|
|
CFLAGS-nscd_getai.c = -fexceptions
|
|
CFLAGS-nscd_initgroups.c = -fexceptions
|
|
|
|
CPPFLAGS-nscd += -DIS_IN_nscd=1 -D_FORTIFY_SOURCE=2 -DNOT_IN_libc=1
|
|
|
|
ifeq (yesyes,$(have-fpie)$(build-shared))
|
|
CFLAGS-nscd += $(pie-ccflag)
|
|
endif
|
|
ifeq (yes,$(have-ssp))
|
|
CFLAGS-nscd += -fstack-protector
|
|
endif
|
|
|
|
ifeq (yesyes,$(have-fpie)$(build-shared))
|
|
LDFLAGS-nscd = -Wl,-z,now
|
|
endif
|
|
|
|
# Set libof-nscd.
|
|
cpp-srcs-left := $(nscd-modules)
|
|
lib := nscd
|
|
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
|
|
|
|
$(objpfx)nscd: $(nscd-modules:%=$(objpfx)%.o)
|
|
|
|
ifeq ($(build-shared),yes)
|
|
$(objpfx)nscd: $(shared-thread-library) $(common-objpfx)nis/libnsl.so
|
|
else
|
|
$(objpfx)nscd: $(static-thread-library) $(common-objpfx)nis/libnsl.a
|
|
endif
|