mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00: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.
90 lines
2.8 KiB
Makefile
90 lines
2.8 KiB
Makefile
# Copyright (C) 1996-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/>.
|
|
|
|
# Generate the list of strings for errno codes from the section of the
|
|
# manual which documents the codes.
|
|
|
|
$(..)sysdeps/gnu/errlist.c: $(..)sysdeps/gnu/errlist.awk \
|
|
$(..)manual/errno.texi
|
|
$(AWK) -f $^ > $@-tmp
|
|
# Make it unwritable so noone will edit it by mistake.
|
|
-chmod a-w $@-tmp
|
|
mv -f $@-tmp $@
|
|
|
|
ifeq ($(subdir),stdio-common)
|
|
|
|
errlist-c = $(firstword $(wildcard $(addsuffix /errlist.c,$(sysdirs) .)))
|
|
|
|
libof-errlist-compat = extramodules
|
|
|
|
ifeq ($(build-shared),yes)
|
|
$(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \
|
|
$(common-objpfx)Versions.v.i $(before-compile)
|
|
else
|
|
$(objpfx)errlist-compat.c: $(errlist-c) $(..)sysdeps/gnu/errlist-compat.awk \
|
|
$(before-compile)
|
|
endif
|
|
$(make-target-directory)
|
|
$(AWK) -v maxerr=`\
|
|
$(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -DEMIT_ERR_MAX $< -o - \
|
|
| sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \
|
|
-f $(..)sysdeps/gnu/errlist-compat.awk \
|
|
$(wildcard $(sysdirs:=/Versions)) > $@T
|
|
# Make it unwritable so noone will edit it by mistake.
|
|
-chmod a-w $@T
|
|
mv -f $@T $@
|
|
$(objpfx)errlist-compat.h: $(objpfx)errlist-compat.c
|
|
sed -n '1p;/ERR_MAX/p' $< > $@T
|
|
-chmod a-w $@T
|
|
mv -f $@T $@
|
|
generated += errlist-compat.c errlist-compat.h
|
|
|
|
# This will force the generation above to happy if need be.
|
|
$(foreach o,$(object-suffixes) $(object-suffixes:=.d),\
|
|
$(objpfx)errlist$o): $(objpfx)errlist-compat.h
|
|
endif
|
|
|
|
ifeq ($(subdir),login)
|
|
sysdep_routines += setutxent getutxent endutxent getutxid getutxline \
|
|
pututxline utmpxname updwtmpx getutmpx getutmp
|
|
|
|
sysdep_headers += utmpx.h bits/utmpx.h
|
|
endif
|
|
|
|
|
|
ifeq ($(subdir),inet)
|
|
sysdep_headers += netinet/udp.h netinet/ip_icmp.h
|
|
endif
|
|
|
|
|
|
ifeq ($(subdir),misc)
|
|
sysdep_headers += sys/mtio.h
|
|
endif
|
|
|
|
|
|
ifeq ($(subdir),csu)
|
|
routines += unwind-resume
|
|
shared-only-routines += unwind-resume
|
|
CFLAGS-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
|
|
endif
|
|
|
|
ifeq ($(subdir),rt)
|
|
librt-sysdep_routines += rt-unwind-resume
|
|
librt-shared-only-routines += rt-unwind-resume
|
|
CFLAGS-rt-unwind-resume.c += -fexceptions -fasynchronous-unwind-tables
|
|
endif
|