mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 19:10:06 +00:00
0f283ffc5e
TLS_INIT_TCB_SIZE, TLS_INIT_TCB_ALIGN instead of 0, 1. * include/getopt.h: Include <features.h> before <posix/getopt.h>. * locale/findlocale.c (_nl_remove_locale): Don't search in _nl_locale_file_list if DATA->alloc is ld_archive. Use _nl_unload_locale to do the rest of the work. * locale/loadarchive.c (_nl_load_locale_from_archive): Set usage_count of new structure to UNDELETABLE. * wctype/wctype.h (iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank, towlower, towupper): Macros removed. * ctype/ctype.h (__tobody): Put parens around macro argument. (__isctype): Macro removed. (__ctype_b, __ctype_tolower, __ctype_toupper): Decls removed. (isalnum, isalpha, iscntrl, isdigit, islower, isgraph, isprint, ispunct, isspace, isupper, isxdigit, isblank, _tolower, _toupper, tolower, toupper): Macros and inlines removed. * include/ctype.h [! NOT_IN_libc] (isalnum, isalpha, iscntrl, isdigit, islower, isgraph, isprint, ispunct, isspace, isupper, isxdigit, isblank, _tolower, _toupper, tolower, toupper): Define here instead, using _NL_CURRENT. * ctype/ctype.c (__ctype_tolower, __ctype_toupper): Define as macros using _NL_CURRENT. * ctype/ctype-extn.c (__ctype_tolower, __ctype_toupper): Likewise. * ctype/ctype-info.c (__ctype_b, __ctype_tolower, __ctype_toupper): Renamed these to __ctype_old_*. Define old names only for SHLIB_COMPAT. (__ctype32_b, __ctype32_tolower, __ctype32_toupper): Likewise. (__ctype32_wctrans, __ctype32_wctrans, __ctype32_width): Removed. * locale/lc-ctype.c (_nl_postload_ctype): Use renamed variables, conditional on SHLIB_COMPAT. Don't set removed variables at all. * wctype/wcfuncs.c: Use _NL_CURRENT instead of those globals. * wcsmbs/wcwidth.h (internal_wcwidth): Likewise. * resolv/res_init.c [RESOLVSORT] (sort_mask): Renamed sort_mask_chars. (ISSORTMASK): Update use. * intl/localealias.c [__GNUC__]: #undef alloca before #define. * nss/nss_files/files-XXX.c (last_use): Rename `none' to `nouse'. (_nss_files_getENTNAME_r): Likewise. * nss/nss_files/files-alias.c (last_use, _nss_files_getaliasent_r): Likewise. * Makerules (all-nonlib): Renamed from all-tests. Include $(others) here too. * locale/Makefile (CPPFLAGS-locale, CPPFLAGS-localedef, CPPFLAGS-ld-ctype, CPPFLAGS-ld-time, CPPFLAGS-ld-numeric, CPPFLAGS-ld-monetary, CPPFLAGS-ld-collate, CPPFLAGS-ld-identification, CPPFLAGS-charmap, CPPFLAGS-locarchive, CPPFLAGS-linereader, CPPFLAGS-charmap-dir): Variables removed. Instead, catch all the program modules via cppflags-iterator.mk. * sunrpc/Makefile (CPPFLAGS-rpc_main): Variable removed. Instead, catch all rpcgen-objs via cppflags-iterator.mk. * posix/tst-getconf.sh: If no third arg, work with static linking.
115 lines
4.2 KiB
Makefile
115 lines
4.2 KiB
Makefile
# Copyright (C) 1991,92,1995-1999,2000,2001,2002 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, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
#
|
|
# Makefile for locales.
|
|
#
|
|
subdir := locale
|
|
|
|
headers = locale.h bits/locale.h langinfo.h xlocale.h
|
|
distribute = localeinfo.h categories.def iso-639.def iso-3166.def \
|
|
iso-4217.def weight.h weightwc.h strlen-hash.h elem-hash.h \
|
|
indigits.h indigitswc.h outdigits.h outdigitswc.h \
|
|
coll-lookup.h C-translit.h.in C-translit.h gen-translit.pl \
|
|
locarchive.h hashval.h \
|
|
$(addprefix programs/, \
|
|
locale.c localedef.c \
|
|
$(localedef-modules:=.c) $(locale-modules:=.c) \
|
|
$(lib-modules:=.c) config.h simple-hash.h \
|
|
charmap-kw.gperf charmap-kw.h locfile-token.h \
|
|
locfile-kw.gperf locfile-kw.h linereader.h \
|
|
locfile.h charmap.h repertoire.h localedef.h \
|
|
3level.h charmap-dir.h locarchive.c)
|
|
routines = setlocale findlocale loadlocale loadarchive \
|
|
localeconv nl_langinfo nl_langinfo_l mb_cur_max \
|
|
newlocale duplocale freelocale uselocale
|
|
tests = tst-C-locale
|
|
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
|
|
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 := $(categories:%=ld-%) charmap linereader locfile \
|
|
repertoire locarchive
|
|
localedef-aux := md5
|
|
locale-modules := locale-spec
|
|
lib-modules := charmap-dir simple-hash xmalloc xstrdup
|
|
|
|
|
|
GPERF = gperf
|
|
GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C
|
|
|
|
include ../Rules
|
|
|
|
programs/%-kw.h: programs/%-kw.gperf
|
|
$(GPERF) $(GPERFFLAGS) -N $(@F:-kw.h=_hash) $< > $@.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 $@
|
|
ifeq ($(with-cvs),yes)
|
|
test ! -d CVS || cvs $(CVSOPTS) commit -mRegenerated $@
|
|
endif
|
|
|
|
localepath = "$(localedir):$(i18ndir)"
|
|
|
|
locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
|
|
-DLOCALEDIR='"$(localedir)"' \
|
|
-DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
|
|
-DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
|
|
-DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
|
|
-DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
|
|
-Iprograms
|
|
|
|
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 is passed for all these modules.
|
|
cpp-srcs-left := $(addsuffix .c,$(localedef-modules) $(localedef-aux) \
|
|
$(locale-modules) $(lib-modules))
|
|
lib := locale_programs
|
|
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
|
|
|
|
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
|
|
# This ensures they will load libc.so for needed symbols if loaded by
|
|
# a statically-linked program that hasn't already loaded it.
|
|
$(objpfx)libBrokenLocale.so: $(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a
|