mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-28 15:51:07 +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.
103 lines
3.5 KiB
Makefile
103 lines
3.5 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/>.
|
|
|
|
#
|
|
# Makefile for locales.
|
|
#
|
|
subdir := locale
|
|
|
|
include ../Makeconfig
|
|
|
|
headers = locale.h bits/locale.h langinfo.h xlocale.h
|
|
routines = setlocale findlocale loadlocale loadarchive \
|
|
localeconv nl_langinfo nl_langinfo_l mb_cur_max \
|
|
newlocale duplocale freelocale uselocale
|
|
tests = tst-C-locale tst-locname tst-duplocale
|
|
categories = ctype messages monetary numeric time paper name \
|
|
address telephone measurement identification collate
|
|
aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
|
|
xlocale localename global-locale coll-lookup
|
|
others = localedef locale
|
|
#others-static = localedef locale
|
|
install-bin = localedef locale
|
|
extra-objs = $(localedef-modules:=.o) $(localedef-aux:=.o) \
|
|
$(locale-modules:=.o) $(lib-modules:=.o)
|
|
|
|
extra-libs = libBrokenLocale
|
|
extra-libs-others = $(extra-libs)
|
|
|
|
libBrokenLocale-routines = broken_cur_max
|
|
|
|
subdir-dirs = programs
|
|
vpath %.c programs ../crypt
|
|
vpath %.h programs
|
|
vpath %.gperf programs
|
|
|
|
localedef-modules := localedef $(categories:%=ld-%) \
|
|
charmap linereader locfile \
|
|
repertoire locarchive
|
|
localedef-aux := md5
|
|
locale-modules := locale locale-spec
|
|
lib-modules := charmap-dir simple-hash xmalloc xstrdup
|
|
|
|
|
|
GPERF = gperf
|
|
GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C
|
|
|
|
include ../Rules
|
|
|
|
CFLAGS-md5.c = -I../crypt
|
|
|
|
programs/%-kw.h: programs/%-kw.gperf
|
|
cd programs \
|
|
&& $(GPERF) $(GPERFFLAGS) -N $(@F:-kw.h=_hash) $(<F) > $(@F).new
|
|
mv -f $@.new $@
|
|
|
|
$(objpfx)localedef: $(localedef-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef: $(localedef-aux:%=$(objpfx)%.o)
|
|
$(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
|
|
$(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
|
|
|
|
C-translit.h: C-translit.h.in gen-translit.pl
|
|
$(PERL) gen-translit.pl < $< > $@.tmp
|
|
mv -f $@.tmp $@
|
|
|
|
localepath = "$(localedir):$(i18ndir)"
|
|
|
|
# -Iprograms doesn't really belong here, but this gets it at the head
|
|
# of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
|
|
# We need it before the standard -I's to see programs/config.h first.
|
|
locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
|
|
-DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
|
|
-Iprograms
|
|
|
|
CPPFLAGS-locale-programs = -DLOCALE_PATH='$(localepath)' \
|
|
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
|
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
|
|
-DLOCSRCDIR='"$(i18ndir)/locales"' \
|
|
-DNOT_IN_libc
|
|
|
|
CFLAGS-charmap.c = -Wno-write-strings -Wno-char-subscripts
|
|
CFLAGS-locfile.c = -Wno-write-strings -Wno-char-subscripts
|
|
CFLAGS-charmap-dir.c = -Wno-write-strings
|
|
|
|
# This makes sure -DNOT_IN_libc et al are passed for all these modules.
|
|
cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \
|
|
$(lib-modules)
|
|
lib := locale-programs
|
|
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
|